diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 20:48:30 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 20:48:30 -0500 |
commit | bc62d262fa73546d324b47348447ca135a4483b5 (patch) | |
tree | 55dac4d6ba9938d6c4ec85653bb838ae1af1eea2 /framework | |
parent | eeac11421792819a42eb442ac4b64fa963901662 (diff) |
targeted string re-work
Change-Id: I2cded25cc1d63a02a14633e2de4c6f37662feb25
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/accelerators/storageholder.cxx | 2 | ||||
-rw-r--r-- | framework/source/uiconfiguration/imagemanagerimpl.cxx | 18 | ||||
-rw-r--r-- | framework/source/uiconfiguration/uicategorydescription.cxx | 12 |
3 files changed, 16 insertions, 16 deletions
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 4f6b140e0427..d442274f94d6 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -62,7 +62,7 @@ #define PATH_SEPERATOR_ASCII "/" #define PATH_SEPERATOR_UNICODE ((sal_Unicode)'/') -#define PATH_SEPERATOR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATH_SEPERATOR_ASCII)) +#define PATH_SEPERATOR ::rtl::OUString(PATH_SEPERATOR_ASCII) //=============================================== // namespace diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 0abb42bb6539..7931cbfff640 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -189,7 +189,7 @@ void CmdImageList::impl_fillCommandToImageNameMap() if ( !m_bVectorInit ) { - const rtl::OUString aCommandImageList( RTL_CONSTASCII_USTRINGPARAM( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST )); + const rtl::OUString aCommandImageList( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST ); Sequence< OUString > aCmdImageSeq; uno::Reference< XNameAccess > xCmdDesc( m_xServiceManager->createInstance( SERVICENAME_UICOMMANDDESCRIPTION ), @@ -237,7 +237,7 @@ void CmdImageList::impl_fillCommandToImageNameMap() // Create a image name vector that must be provided to the vcl imagelist. We also need // a command to image name map to speed up access time for image retrieval. - OUString aUNOString( RTL_CONSTASCII_USTRINGPARAM( ".uno:" )); + OUString aUNOString( ".uno:" ); String aEmptyString; const sal_uInt32 nCount = m_aImageCommandNameVector.size(); for ( sal_uInt32 i = 0; i < nCount; i++ ) @@ -458,11 +458,11 @@ void ImageManagerImpl::implts_initialize() try { - m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( IMAGE_FOLDER )), + m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString(IMAGE_FOLDER ), nModes ); if ( m_xUserImageStorage.is() ) { - m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( BITMAPS_FOLDER )), + m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString(BITMAPS_FOLDER ), nModes ); } } @@ -692,8 +692,8 @@ ImageManagerImpl::ImageManagerImpl( const uno::Reference< XMultiServiceFactory > ThreadHelpBase( &Application::GetSolarMutex() ) , m_xServiceManager( xServiceManager ) , m_pDefaultImageList( 0 ) - , m_aXMLPostfix( RTL_CONSTASCII_USTRINGPARAM( ".xml" )) - , m_aResourceString( RTL_CONSTASCII_USTRINGPARAM( ModuleImageList )) + , m_aXMLPostfix( ".xml" ) + , m_aResourceString( ModuleImageList ) , m_aListenerContainer( m_aLock.getShareableOslMutex() ) , m_bUseGlobal(_bUseGlobal) , m_bReadOnly( true ) @@ -791,7 +791,7 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments ) if ( xPropSet.is() ) { long nOpenMode = 0; - if ( xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenMode" ))) >>= nOpenMode ) + if ( xPropSet->getPropertyValue( rtl::OUString( "OpenMode" )) >>= nOpenMode ) m_bReadOnly = !( nOpenMode & ElementModes::WRITE ); } } @@ -1352,11 +1352,11 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException { long nModes = ElementModes::READWRITE; - uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( IMAGE_FOLDER )), + uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString(IMAGE_FOLDER ), nModes ); if ( xUserImageStorage.is() ) { - uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( BITMAPS_FOLDER )), + uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString(BITMAPS_FOLDER ), nModes ); for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ ) { diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 414a4da3575e..8b95946b62f4 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -156,8 +156,8 @@ class ConfigurationAccess_UICategory : // Order is neccessary for right initiali ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const rtl::OUString& aModuleName, const Reference< XNameAccess >& rGenericUICategories, const Reference< XMultiServiceFactory >& rServiceManager ) : ThreadHelpBase(), - m_aConfigCategoryAccess( RTL_CONSTASCII_USTRINGPARAM( CONFIGURATION_ROOT_ACCESS )), - m_aPropUIName( RTL_CONSTASCII_USTRINGPARAM( CONFIGURATION_PROPERTY_NAME )), + m_aConfigCategoryAccess( CONFIGURATION_ROOT_ACCESS ), + m_aPropUIName( CONFIGURATION_PROPERTY_NAME ), m_xGenericUICategories( rGenericUICategories ), m_xServiceManager( rServiceManager ), m_bConfigAccessInitialized( sal_False ), @@ -166,7 +166,7 @@ ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const rtl::OUStr RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::ConfigurationAccess_UICategory" ); // Create configuration hierachical access name m_aConfigCategoryAccess += aModuleName; - m_aConfigCategoryAccess += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONFIGURATION_CATEGORY_ELEMENT_ACCESS )); + m_aConfigCategoryAccess += rtl::OUString( CONFIGURATION_CATEGORY_ELEMENT_ACCESS ); m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance(SERVICENAME_CFGPROVIDER),UNO_QUERY ); } @@ -374,7 +374,7 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess() try { - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" )); + aPropValue.Name = rtl::OUString( "nodepath" ); aPropValue.Value <<= m_aConfigCategoryAccess; aArgs[0] <<= aPropValue; @@ -447,12 +447,12 @@ UICategoryDescription::UICategoryDescription( const Reference< XMultiServiceFact UICommandDescription(xServiceManager,true) { Reference< XNameAccess > xEmpty; - rtl::OUString aGenericCategories( RTL_CONSTASCII_USTRINGPARAM( "GenericCategories" )); + rtl::OUString aGenericCategories( "GenericCategories" ); m_xGenericUICommands = new ConfigurationAccess_UICategory( aGenericCategories, xEmpty, xServiceManager ); // insert generic categories mappings m_aModuleToCommandFileMap.insert( ModuleToCommandFileMap::value_type( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GENERIC_MODULE_NAME )), aGenericCategories )); + rtl::OUString(GENERIC_MODULE_NAME ), aGenericCategories )); UICommandsHashMap::iterator pCatIter = m_aUICommandsHashMap.find( aGenericCategories ); if ( pCatIter != m_aUICommandsHashMap.end() ) |