From 2b3e2258530b8214229f2c6a8dab385b508eb9bf Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 9 Sep 2013 00:58:15 +0300 Subject: Bin some uses of the stupid DECLARE_ASCII macro Change-Id: I076eef8069e848ec3cf9c69f1b489ad44586324e --- .../documentacceleratorconfiguration.cxx | 7 +--- .../globalacceleratorconfiguration.cxx | 6 +-- framework/source/accelerators/keymapping.cxx | 2 +- .../moduleacceleratorconfiguration.cxx | 7 +--- framework/source/accelerators/presethandler.cxx | 45 ++++++++-------------- framework/source/dispatch/interceptionhelper.cxx | 4 +- framework/source/fwi/jobs/configaccess.cxx | 2 +- .../source/fwi/threadhelp/transactionmanager.cxx | 6 +-- framework/source/helper/persistentwindowstate.cxx | 4 +- framework/source/helper/titlebarupdate.cxx | 8 ++-- framework/source/jobs/job.cxx | 4 +- framework/source/layoutmanager/layoutmanager.cxx | 5 +-- .../source/recording/dispatchrecordersupplier.cxx | 4 +- framework/source/services/desktop.cxx | 6 +-- framework/source/services/frame.cxx | 8 ++-- framework/source/services/pathsettings.cxx | 7 +--- framework/source/services/urltransformer.cxx | 2 +- framework/source/tabwin/tabwindow.cxx | 2 +- framework/source/uiconfiguration/imagemanager.cxx | 7 +--- .../source/uiconfiguration/moduleuicfgsupplier.cxx | 2 +- .../moduleuiconfigurationmanager.cxx | 7 +--- .../uiconfiguration/uicategorydescription.cxx | 11 ++---- .../uiconfiguration/windowstateconfiguration.cxx | 2 +- .../source/uielement/popuptoolbarcontroller.cxx | 20 +++++----- .../source/uielement/uicommanddescription.cxx | 2 +- .../source/uifactory/uielementfactorymanager.cxx | 2 +- .../uifactory/windowcontentfactorymanager.cxx | 2 +- .../source/xml/acceleratorconfigurationreader.cxx | 6 +-- 28 files changed, 78 insertions(+), 112 deletions(-) (limited to 'framework') diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index b5a91da7a645..d3283faf219a 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -46,9 +46,6 @@ #include #include -#define SERVICENAME_DOCUMENTACCELERATORCONFIGURATION DECLARE_ASCII("com.sun.star.ui.DocumentAcceleratorConfiguration") -#define IMPLEMENTATIONNAME_DOCUMENTACCELERATORCONFIGURATION DECLARE_ASCII("com.sun.star.comp.framework.DocumentAcceleratorConfiguration") - namespace framework { @@ -57,8 +54,8 @@ namespace framework DEFINE_XSERVICEINFO_MULTISERVICE_2(DocumentAcceleratorConfiguration , ::cppu::OWeakObject , - SERVICENAME_DOCUMENTACCELERATORCONFIGURATION , - IMPLEMENTATIONNAME_DOCUMENTACCELERATORCONFIGURATION) + "com.sun.star.ui.DocumentAcceleratorConfiguration" , + "com.sun.star.comp.framework.DocumentAcceleratorConfiguration") DEFINE_INIT_SERVICE(DocumentAcceleratorConfiguration, { diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index 6d55b06e29fb..2688fde71731 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -35,8 +35,6 @@ #include #include -#define IMPLEMENTATIONNAME_GLOBALACCELERATORCONFIGURATION DECLARE_ASCII("com.sun.star.comp.framework.GlobalAcceleratorConfiguration") - namespace framework { @@ -45,8 +43,8 @@ namespace framework DEFINE_XSERVICEINFO_MULTISERVICE_2(GlobalAcceleratorConfiguration , ::cppu::OWeakObject , - DECLARE_ASCII("com.sun.star.ui.GlobalAcceleratorConfiguration"), - IMPLEMENTATIONNAME_GLOBALACCELERATORCONFIGURATION) + "com.sun.star.ui.GlobalAcceleratorConfiguration" , + "com.sun.star.comp.framework.GlobalAcceleratorConfiguration") DEFINE_INIT_SERVICE(GlobalAcceleratorConfiguration, { diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx index 27d9042c6500..b0606f52a5a0 100644 --- a/framework/source/accelerators/keymapping.cxx +++ b/framework/source/accelerators/keymapping.cxx @@ -174,7 +174,7 @@ sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier) sal_uInt16 nCode = 0; if (!KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(sIdentifier, nCode)) throw css::lang::IllegalArgumentException( - DECLARE_ASCII("Cant map given identifier to a valid key code value."), + "Cant map given identifier to a valid key code value.", css::uno::Reference< css::uno::XInterface >(), 0); diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index 186ed0e2ab41..84dd43f90351 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -38,9 +38,6 @@ #include -#define SERVICENAME_MODULEACCELERATORCONFIGURATION DECLARE_ASCII("com.sun.star.ui.ModuleAcceleratorConfiguration") -#define IMPLEMENTATIONNAME_MODULEACCELERATORCONFIGURATION DECLARE_ASCII("com.sun.star.comp.framework.ModuleAcceleratorConfiguration") - namespace framework { @@ -49,8 +46,8 @@ namespace framework DEFINE_XSERVICEINFO_MULTISERVICE_2(ModuleAcceleratorConfiguration , ::cppu::OWeakObject , - SERVICENAME_MODULEACCELERATORCONFIGURATION , - IMPLEMENTATIONNAME_MODULEACCELERATORCONFIGURATION) + "com.sun.star.ui.ModuleAcceleratorConfiguration" , + "com.sun.star.comp.framework.ModuleAcceleratorConfiguration") DEFINE_INIT_SERVICE(ModuleAcceleratorConfiguration, { diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index c69b8336b69e..b00d5c31b01b 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -42,21 +42,10 @@ #include -#define SUBSTORAGE_GLOBAL DECLARE_ASCII("global" ) -#define SUBSTORAGE_MODULES DECLARE_ASCII("modules") - -#define RELPATH_SHARE_LAYER DECLARE_ASCII("soffice.cfg") -#define RELPATH_USER_LAYER DECLARE_ASCII("soffice.cfg") - -#define FILE_EXTENSION DECLARE_ASCII(".xml") - -#define PATH_SEPARATOR DECLARE_ASCII("/") - static const ::sal_Int32 ID_CORRUPT_UICONFIG_SHARE = 1; static const ::sal_Int32 ID_CORRUPT_UICONFIG_USER = 2; static const ::sal_Int32 ID_CORRUPT_UICONFIG_GENERAL = 3; - namespace framework { @@ -241,7 +230,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag if (nPos != sShareLayer.getLength()-1) sShareLayer += OUString("/"); - sShareLayer += RELPATH_SHARE_LAYER; // folder + sShareLayer += "soffice.cfg"; /* // TODO remove me! // Attention: This is temp. workaround ... We create a temp. storage file @@ -294,7 +283,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag if (nPos != sUserLayer.getLength()-1) sUserLayer += OUString("/"); - sUserLayer += RELPATH_USER_LAYER; // storage file + sUserLayer += "soffice.cfg"; // storage file css::uno::Sequence< css::uno::Any > lArgs(2); lArgs[0] <<= sUserLayer; @@ -422,9 +411,9 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType { case E_GLOBAL : { - sRelPathBuf.append(SUBSTORAGE_GLOBAL); - sRelPathBuf.append(PATH_SEPARATOR ); - sRelPathBuf.append(sResource ); + sRelPathBuf.append("global"); + sRelPathBuf.append("/"); + sRelPathBuf.append(sResource); sRelPathShare = sRelPathBuf.makeStringAndClear(); sRelPathUser = sRelPathShare; @@ -435,11 +424,11 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType case E_MODULES : { - sRelPathBuf.append(SUBSTORAGE_MODULES); - sRelPathBuf.append(PATH_SEPARATOR ); - sRelPathBuf.append(sModule ); - sRelPathBuf.append(PATH_SEPARATOR ); - sRelPathBuf.append(sResource ); + sRelPathBuf.append("modules"); + sRelPathBuf.append("/"); + sRelPathBuf.append(sModule); + sRelPathBuf.append("/"); + sRelPathBuf.append(sResource); sRelPathShare = sRelPathBuf.makeStringAndClear(); sRelPathUser = sRelPathShare; @@ -519,7 +508,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType for (i=0; i -1) sTemp = sTemp.copy(0,nPos); lPresets.push_back(sTemp); @@ -537,7 +526,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType for (i=0; i -1) sTemp = sTemp.copy(0,nPos); lTargets.push_back(sTemp); @@ -593,10 +582,10 @@ void PresetHandler::copyPresetToTarget(const OUString& sPreset, } OUString sPresetFile(sPreset); - sPresetFile += FILE_EXTENSION; + sPresetFile += ".xml"; OUString sTargetFile(sTarget); - sTargetFile += FILE_EXTENSION; + sTargetFile += ".xml"; // remove existing elements before you try to copy the preset to that location ... // Otherwise w will get an ElementExistException inside copyElementTo()! @@ -626,7 +615,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString return css::uno::Reference< css::io::XStream >(); OUString sFile(sPreset); - sFile += FILE_EXTENSION; + sFile += ".xml"; // inform user about errors (use original exceptions!) css::uno::Reference< css::io::XStream > xStream = xFolder->openStreamElement(sFile, css::embed::ElementModes::READ); @@ -648,7 +637,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString return css::uno::Reference< css::io::XStream >(); OUString sFile(sTarget); - sFile += FILE_EXTENSION; + sFile += ".xml"; sal_Int32 nOpenMode = css::embed::ElementModes::READWRITE; if (!bCreateIfMissing) @@ -846,7 +835,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat // Otherwhise we have no acc config at all, which can make other trouble. OUString sLocalizedPath; sLocalizedPath = sPath; - sLocalizedPath += PATH_SEPARATOR; + sLocalizedPath += "/"; if (pLocaleFolder != lSubFolders.end()) sLocalizedPath += *pLocaleFolder; else diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index a46a60e84f60..ebbd9c91e7c2 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -106,7 +106,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css: // reject wrong calling of this interface method css::uno::Reference< css::frame::XDispatchProvider > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); if (!xInterceptor.is()) - throw css::uno::RuntimeException(DECLARE_ASCII("NULL references not allowed as in parameter"), xThis); + throw css::uno::RuntimeException("NULL references not allowed as in parameter", xThis); // Fill a new info structure for new interceptor. // Save his reference and try to get an additional URL/pattern list from him. @@ -186,7 +186,7 @@ void SAL_CALL InterceptionHelper::releaseDispatchProviderInterceptor(const css:: // reject wrong calling of this interface method css::uno::Reference< css::frame::XDispatchProvider > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); if (!xInterceptor.is()) - throw css::uno::RuntimeException(DECLARE_ASCII("NULL references not allowed as in parameter"), xThis); + throw css::uno::RuntimeException("NULL references not allowed as in parameter", xThis); // SAFE { WriteGuard aWriteLock(m_aLock); diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx index ca37516aa98c..59372b03a8f0 100644 --- a/framework/source/fwi/jobs/configaccess.cxx +++ b/framework/source/fwi/jobs/configaccess.cxx @@ -123,7 +123,7 @@ void ConfigAccess::open( /*IN*/ EOpenMode eMode ) // create the configuration provider, which provides sub access points css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider = css::configuration::theDefaultProvider::get(m_xContext); css::beans::PropertyValue aParam; - aParam.Name = DECLARE_ASCII("nodepath"); + aParam.Name = "nodepath"; aParam.Value <<= m_sRoot; css::uno::Sequence< css::uno::Any > lParams(1); diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index b5458227a87e..3e5c98983de2 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -297,20 +297,20 @@ void TransactionManager::impl_throwExceptions( EExceptionMode eMode, ERejectReas // Help programmer to find out, why this exception is thrown! SAL_WARN( "fwk", "TransactionManager...: Owner instance not correctly initialized yet. Call was rejected! Normally it's an algorithm error ... wrong use of class!" ); //ATTENTION: temp. disabled - till all bad code positions are detected and changed! */ - // throw css::uno::RuntimeException( DECLARE_ASCII("TransactionManager...\nOwner instance not right initialized yet. Call was rejected! Normaly it's an algorithm error ... wrong usin of class!\n" ), css::uno::Reference< css::uno::XInterface >() ); + // throw css::uno::RuntimeException( "TransactionManager...\nOwner instance not right initialized yet. Call was rejected! Normaly it's an algorithm error ... wrong usin of class!\n", css::uno::Reference< css::uno::XInterface >() ); } break; case E_INCLOSE : if( eMode == E_HARDEXCEPTIONS ) { // Help programmer to find out, why this exception is thrown! SAL_WARN( "fwk", "TransactionManager...: Owner instance stand in close method. Call was rejected!" ); - throw css::lang::DisposedException( DECLARE_ASCII("TransactionManager...\nOwner instance stand in close method. Call was rejected!\n" ), css::uno::Reference< css::uno::XInterface >() ); + throw css::lang::DisposedException( "TransactionManager...\nOwner instance stand in close method. Call was rejected!\n", css::uno::Reference< css::uno::XInterface >() ); } break; case E_CLOSED : { // Help programmer to find out, why this exception is thrown! SAL_WARN( "fwk", "TransactionManager...: Owner instance already closed. Call was rejected!" ); - throw css::lang::DisposedException( DECLARE_ASCII("TransactionManager...\nOwner instance already closed. Call was rejected!\n" ), css::uno::Reference< css::uno::XInterface >() ); + throw css::lang::DisposedException( "TransactionManager...\nOwner instance already closed. Call was rejected!\n", css::uno::Reference< css::uno::XInterface >() ); } case E_NOREASON : { // Help programmer to find out diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index d0c0f63edc97..1b5f6ce72491 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -66,14 +66,14 @@ void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::u css::uno::Reference< css::frame::XFrame > xFrame; if (lArguments.getLength() < 1) throw css::lang::IllegalArgumentException( - DECLARE_ASCII("Empty argument list!"), + "Empty argument list!", static_cast< ::cppu::OWeakObject* >(this), 1); lArguments[0] >>= xFrame; if (!xFrame.is()) throw css::lang::IllegalArgumentException( - DECLARE_ASCII("No valid frame specified!"), + "No valid frame specified!", static_cast< ::cppu::OWeakObject* >(this), 1); diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index c85c4b63bd4a..3370de420387 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -75,14 +75,14 @@ void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any css::uno::Reference< css::frame::XFrame > xFrame; if (lArguments.getLength() < 1) throw css::lang::IllegalArgumentException( - DECLARE_ASCII("Empty argument list!"), + "Empty argument list!", static_cast< ::cppu::OWeakObject* >(this), 1); lArguments[0] >>= xFrame; if (!xFrame.is()) throw css::lang::IllegalArgumentException( - DECLARE_ASCII("No valid frame specified!"), + "No valid frame specified!", static_cast< ::cppu::OWeakObject* >(this), 1); @@ -292,8 +292,8 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra try { css::uno::Reference< css::beans::XPropertySetInfo > const xPSI( xSet->getPropertySetInfo(), css::uno::UNO_SET_THROW ); - if ( xPSI->hasPropertyByName( DECLARE_ASCII("IconId") ) ) - xSet->getPropertyValue( DECLARE_ASCII("IconId") ) >>= nIcon; + if ( xPSI->hasPropertyByName( "IconId" ) ) + xSet->getPropertyValue( "IconId" ) >>= nIcon; } catch(const css::uno::Exception&) { diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index d3e7ca9a0504..53c7603e0b60 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -720,7 +720,7 @@ void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) thro if (m_eRunState != E_STOPPED_OR_FINISHED) { css::uno::Reference< css::uno::XInterface > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); - throw css::frame::TerminationVetoException(DECLARE_ASCII("job still in progress"), xThis); + throw css::frame::TerminationVetoException("job still in progress", xThis); } aReadLock.unlock(); @@ -820,7 +820,7 @@ void SAL_CALL Job::queryClosing( const css::lang::EventObject& aEvent , // throw suitable veto exception - because the internal job could not be cancelled. css::uno::Reference< css::uno::XInterface > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); - throw css::util::CloseVetoException(DECLARE_ASCII("job still in progress"), xThis); + throw css::util::CloseVetoException("job still in progress", xThis); } // No veto ... diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 97629d2b205f..a1b21c7800c7 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -100,15 +100,12 @@ static const sal_Int32 DOCKWIN_ID_BASE = 9800; static const char STATUS_BAR_ALIAS[] = "private:resource/statusbar/statusbar"; static const char PROGRESS_BAR_ALIAS[] = "private:resource/progressbar/progressbar"; -#define SERVICENAME_LAYOUTMANAGER DECLARE_ASCII("com.sun.star.frame.LayoutManager" ) -#define IMPLEMENTATIONNAME_LAYOUTMANAGER DECLARE_ASCII("com.sun.star.comp.framework.LayoutManager" ) - namespace framework { IMPLEMENT_FORWARD_XTYPEPROVIDER2( LayoutManager, LayoutManager_Base, LayoutManager_PBase ) IMPLEMENT_FORWARD_XINTERFACE2( LayoutManager, LayoutManager_Base, LayoutManager_PBase ) -DEFINE_XSERVICEINFO_MULTISERVICE_2( LayoutManager, ::cppu::OWeakObject, SERVICENAME_LAYOUTMANAGER, IMPLEMENTATIONNAME_LAYOUTMANAGER) +DEFINE_XSERVICEINFO_MULTISERVICE_2( LayoutManager, ::cppu::OWeakObject, "com.sun.star.frame.LayoutManager", "com.sun.star.comp.framework.LayoutManager") DEFINE_INIT_SERVICE( LayoutManager, {} ) LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) : LayoutManager_Base() diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx index fc2990983cca..2f6e65d4c920 100644 --- a/framework/source/recording/dispatchrecordersupplier.cxx +++ b/framework/source/recording/dispatchrecordersupplier.cxx @@ -150,10 +150,10 @@ void SAL_CALL DispatchRecorderSupplier::dispatchAndRecord( const css::util::URL& // clear unspecific situations if (!xDispatcher.is()) - throw css::uno::RuntimeException(DECLARE_ASCII("specification violation: dispatcher is NULL"), static_cast< ::cppu::OWeakObject* >(this)); + throw css::uno::RuntimeException("specification violation: dispatcher is NULL", static_cast< ::cppu::OWeakObject* >(this)); if (!xRecorder.is()) - throw css::uno::RuntimeException(DECLARE_ASCII("specification violation: no valid dispatch recorder available"), static_cast< ::cppu::OWeakObject* >(this)); + throw css::uno::RuntimeException("specification violation: no valid dispatch recorder available", static_cast< ::cppu::OWeakObject* >(this)); // check, if given dispatch supports record functionality by itself ... // or must be wrapped. diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 8ea6f783c28e..bcc9864537d6 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -79,9 +79,9 @@ namespace framework{ // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( Desktop , - ::cppu::OWeakObject , - DECLARE_ASCII("com.sun.star.frame.Desktop" ), +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( Desktop, + ::cppu::OWeakObject, + "com.sun.star.frame.Desktop", IMPLEMENTATIONNAME_DESKTOP ) diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 15a809bf5286..6c06d503a84e 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -1600,11 +1600,11 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close /* SAFE */ } - throw css::util::CloseVetoException(DECLARE_ASCII("Frame in use for loading document ..."),static_cast< ::cppu::OWeakObject*>(this)); + throw css::util::CloseVetoException("Frame in use for loading document ...",static_cast< ::cppu::OWeakObject*>(this)); } if ( ! setComponent(NULL,NULL) ) - throw css::util::CloseVetoException(DECLARE_ASCII("Component couldn't be deattached ..."),static_cast< ::cppu::OWeakObject*>(this)); + throw css::util::CloseVetoException("Component couldn't be deattached ...",static_cast< ::cppu::OWeakObject*>(this)); // If closing is allowed ... inform all istener and dispose this frame! pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >*) NULL ) ); @@ -2329,7 +2329,7 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css:: /* SAFE */ css::util::URL aURL; - aURL.Complete = DECLARE_ASCII(".uno:CloseFrame"); + aURL.Complete = ".uno:CloseFrame"; css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(xContext)); xParser->parseStrict(aURL); @@ -2391,7 +2391,7 @@ void SAL_CALL Frame::windowShown( const css::lang::EventObject& ) throw(css::uno { css::uno::Reference< css::task::XJobExecutor > xExecutor = css::task::JobExecutor::create( xContext ); - xExecutor->trigger( DECLARE_ASCII("onFirstVisibleTask") ); + xExecutor->trigger( "onFirstVisibleTask" ); } } } diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index e05177b9cd84..a6996fe26cac 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -73,9 +73,6 @@ sal_Int32 impl_getPropGroup(sal_Int32 nID) } -#define SERVICENAME_PATHSETTINGS DECLARE_ASCII("com.sun.star.util.PathSettings" ) -#define IMPLEMENTATIONNAME_PATHSETTINGS DECLARE_ASCII("com.sun.star.comp.framework.PathSettings" ) - namespace framework { @@ -84,8 +81,8 @@ namespace framework DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( PathSettings , ::cppu::OWeakObject , - SERVICENAME_PATHSETTINGS , - IMPLEMENTATIONNAME_PATHSETTINGS + "com.sun.star.util.PathSettings" , + "com.sun.star.comp.framework.PathSettings" ) DEFINE_INIT_SERVICE ( PathSettings, diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 53ff35d761f9..19bca3b684ad 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -56,7 +56,7 @@ URLTransformer::~URLTransformer() DEFINE_XSERVICEINFO_MULTISERVICE ( URLTransformer , OWeakObject , - DECLARE_ASCII("com.sun.star.util.URLTransformer"), + "com.sun.star.util.URLTransformer" , IMPLEMENTATIONNAME_URLTRANSFORMER ) diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 74cce4e8e6f7..7b6d5881bcef 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -378,7 +378,7 @@ throw (css::uno::Exception, css::uno::RuntimeException) // create a tab control window properties aDescriptor.Type = css::awt::WindowClass_SIMPLE; - aDescriptor.WindowServiceName = DECLARE_ASCII("tabcontrol"); + aDescriptor.WindowServiceName = "tabcontrol"; aDescriptor.ParentIndex = -1; aDescriptor.Parent = css::uno::Reference< css::awt::XWindowPeer >( xTopWindow, css::uno::UNO_QUERY ); aDescriptor.Bounds = css::awt::Rectangle( 0,0,0,0 ); diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index e43718a75f6d..ecf89ec12b59 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -73,16 +73,13 @@ const sal_Int16 MAX_IMAGETYPE_VALUE = ::com::sun::star::ui::ImageType::COL namespace framework { -#define SERVICENAME_IMAGEMANAGER DECLARE_ASCII("com.sun.star.ui.ImageManager" ) -#define IMPLEMENTATIONNAME_IMAGEMANAGER DECLARE_ASCII("com.sun.star.comp.framework.ImageManager" ) - //***************************************************************************************************************** // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XSERVICEINFO_MULTISERVICE_2 ( ImageManager , ::cppu::OWeakObject , - SERVICENAME_IMAGEMANAGER , - IMPLEMENTATIONNAME_IMAGEMANAGER + "com.sun.star.ui.ImageManager" , + "com.sun.star.comp.framework.ImageManager" ) DEFINE_INIT_SERVICE ( ImageManager, {} ) diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 832b102cca91..48f116a9f74e 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -75,7 +75,7 @@ class RootStorageWrapper : public ::cppu::WeakImplHelper1< com::sun::star::embe DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( ModuleUIConfigurationManagerSupplier , ::cppu::OWeakObject , - DECLARE_ASCII("com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ), + "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" , IMPLEMENTATIONNAME_MODULEUICONFIGURATIONMANAGERSUPPLIER ) diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index eaadaa583df0..a6970ca43fc0 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -56,17 +56,14 @@ using namespace ::com::sun::star::ui; namespace framework { -#define SERVICENAME_MODULEUICONFIGURATIONMANAGER DECLARE_ASCII("com.sun.star.ui.ModuleUIConfigurationManager" ) -#define IMPLEMENTATIONNAME_MODULEUICONFIGURATIONMANAGER DECLARE_ASCII("com.sun.star.comp.framework.ModuleUIConfigurationManager" ) - //***************************************************************************************************************** // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XSERVICEINFO_MULTISERVICE_2 ( ModuleUIConfigurationManager , ::cppu::OWeakObject , - SERVICENAME_MODULEUICONFIGURATIONMANAGER , - IMPLEMENTATIONNAME_MODULEUICONFIGURATIONMANAGER + "com.sun.star.ui.ModuleUIConfigurationManager" , + "com.sun.star.comp.framework.ModuleUIConfigurationManager" ) DEFINE_INIT_SERVICE ( ModuleUIConfigurationManager, {} ) diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 32130297c8b1..56f0e977fe8b 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -400,13 +400,10 @@ void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEve // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -#define SERVICENAME_UICATEGORYDESCRIPTION DECLARE_ASCII("com.sun.star.ui.UICategoryDescription" ) -#define IMPLEMENTATIONNAME_UICATEGORYDESCRIPTION DECLARE_ASCII("com.sun.star.comp.framework.UICategoryDescription" ) - -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2 ( UICategoryDescription , - ::cppu::OWeakObject , - SERVICENAME_UICATEGORYDESCRIPTION , - IMPLEMENTATIONNAME_UICATEGORYDESCRIPTION +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2 ( UICategoryDescription , + ::cppu::OWeakObject , + "com.sun.star.ui.UICategoryDescription", + "com.sun.star.comp.framework.UICategoryDescription" ) DEFINE_INIT_SERVICE ( UICategoryDescription, {} ) diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 3f7ec4bd938c..a68fbb15c75b 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -1302,7 +1302,7 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess() //***************************************************************************************************************** DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( WindowStateConfiguration , ::cppu::OWeakObject , - DECLARE_ASCII("com.sun.star.ui.WindowStateConfiguration"), + "com.sun.star.ui.WindowStateConfiguration" , IMPLEMENTATIONNAME_WINDOWSTATECONFIGURATION ) diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 1660e6cfec37..2844cbd012fd 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -179,18 +179,18 @@ void PopupMenuToolbarController::createPopupMenuController() css::uno::Sequence< css::uno::Any > aArgs( 2 ); css::beans::PropertyValue aProp; - aProp.Name = DECLARE_ASCII( "Frame" ); + aProp.Name = "Frame"; aProp.Value <<= m_xFrame; aArgs[0] <<= aProp; - aProp.Name = DECLARE_ASCII( "ModuleIdentifier" ); + aProp.Name = "ModuleIdentifier"; aProp.Value <<= getModuleName(); aArgs[1] <<= aProp; try { m_xPopupMenu.set( m_xContext->getServiceManager()->createInstanceWithContext( - DECLARE_ASCII( "com.sun.star.awt.PopupMenu" ), m_xContext ), + "com.sun.star.awt.PopupMenu", m_xContext ), css::uno::UNO_QUERY_THROW ); m_xPopupMenuController.set( m_xPopupMenuFactory->createInstanceWithArgumentsAndContext( @@ -210,8 +210,8 @@ void PopupMenuToolbarController::createPopupMenuController() DEFINE_XSERVICEINFO_MULTISERVICE_2( WizardsToolbarController, ::cppu::OWeakObject, - DECLARE_ASCII("com.sun.star.frame.ToolbarController"), - DECLARE_ASCII("org.apache.openoffice.comp.framework.WizardsToolbarController") + "com.sun.star.frame.ToolbarController", + "org.apache.openoffice.comp.framework.WizardsToolbarController" ) DEFINE_INIT_SERVICE( WizardsToolbarController, {} ) @@ -229,23 +229,23 @@ sal_uInt16 WizardsToolbarController::getDropDownStyle() const DEFINE_XSERVICEINFO_MULTISERVICE_2( OpenToolbarController, ::cppu::OWeakObject, - DECLARE_ASCII("com.sun.star.frame.ToolbarController"), - DECLARE_ASCII("org.apache.openoffice.comp.framework.OpenToolbarController") + "com.sun.star.frame.ToolbarController", + "org.apache.openoffice.comp.framework.OpenToolbarController" ) DEFINE_INIT_SERVICE( OpenToolbarController, {} ) OpenToolbarController::OpenToolbarController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) - : PopupMenuToolbarController( xContext, DECLARE_ASCII( UNO_COMMAND_RECENT_FILE_LIST ) ) + : PopupMenuToolbarController( xContext, UNO_COMMAND_RECENT_FILE_LIST ) { } DEFINE_XSERVICEINFO_MULTISERVICE_2( NewToolbarController, ::cppu::OWeakObject, - DECLARE_ASCII("com.sun.star.frame.ToolbarController"), - DECLARE_ASCII("org.apache.openoffice.comp.framework.NewToolbarController") + "com.sun.star.frame.ToolbarController", + "org.apache.openoffice.comp.framework.NewToolbarController" ) DEFINE_INIT_SERVICE( NewToolbarController, {} ) diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 9280afe98585..f68f481dce3d 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -613,7 +613,7 @@ void SAL_CALL ConfigurationAccess_UICommand::disposing( const EventObject& aEven //***************************************************************************************************************** DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2 ( UICommandDescription , ::cppu::OWeakObject , - DECLARE_ASCII("com.sun.star.frame.UICommandDescription"), + "com.sun.star.frame.UICommandDescription", IMPLEMENTATIONNAME_UICOMMANDDESCRIPTION ) diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index a550a8ece38f..1c203db3bcaf 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -361,7 +361,7 @@ sal_Bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aE //***************************************************************************************************************** DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2 ( UIElementFactoryManager , ::cppu::OWeakObject , - DECLARE_ASCII("com.sun.star.ui.UIElementFactoryManager"), + "com.sun.star.ui.UIElementFactoryManager", IMPLEMENTATIONNAME_UIELEMENTFACTORYMANAGER ) diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index 41d940773fff..672041e6b1e7 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -56,7 +56,7 @@ namespace framework //***************************************************************************************************************** DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2 ( WindowContentFactoryManager , ::cppu::OWeakObject , - DECLARE_ASCII("com.sun.star.ui.WindowContentFactoryManager"), + "com.sun.star.ui.WindowContentFactoryManager", IMPLEMENTATIONNAME_WINDOWCONTENTFACTORYMANAGER ) diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 168d867d357d..478f1b327b1c 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -251,7 +251,7 @@ AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::impl eElement = E_ELEMENT_ITEM; else throw css::uno::RuntimeException( - DECLARE_ASCII("Unknown XML element detected!"), + "Unknown XML element detected!", css::uno::Reference< css::xml::sax::XDocumentHandler >()); return eElement; @@ -276,7 +276,7 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im eAttribute = E_ATTRIBUTE_URL; else throw css::uno::RuntimeException( - DECLARE_ASCII("Unknown XML attribute detected!"), + "Unknown XML attribute detected!", css::uno::Reference< css::xml::sax::XDocumentHandler >()); return eAttribute; @@ -286,7 +286,7 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im OUString AcceleratorConfigurationReader::implts_getErrorLineString() { if (!m_xLocator.is()) - return DECLARE_ASCII("Error during parsing XML. (No further info available ...)"); + return "Error during parsing XML. (No further info available ...)"; OUStringBuffer sMsg(256); sMsg.appendAscii("Error during parsing XML in\nline = "); -- cgit