diff options
| author | Krisztian Pinter <pin.terminator@gmail.com> | 2013-03-08 03:07:46 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-08 02:45:23 +0000 |
| commit | fd4380759d67bcfa582dd8880077ea8445ab8a06 (patch) | |
| tree | 606dee7c3f7e0b6987976302865dfc2a4ac77570 | |
| parent | 925138ec7f0a162bd3d984935849226ad91126ca (diff) | |
RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals
Change-Id: Ief6418425676d6943993513c4d05c8d22e4740cf
Reviewed-on: https://gerrit.libreoffice.org/2470
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
60 files changed, 1504 insertions, 1505 deletions
diff --git a/framework/inc/framework/addonsoptions.hxx b/framework/inc/framework/addonsoptions.hxx index a4d4ffacb443..def743378216 100644 --- a/framework/inc/framework/addonsoptions.hxx +++ b/framework/inc/framework/addonsoptions.hxx @@ -51,18 +51,18 @@ #define ADDONSMENUITEM_CONTEXT_LEN 7 #define ADDONSMENUITEM_IMAGEIDENTIFIER_LEN 15 -#define ADDONSMENUITEM_PROPERTYNAME_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_URL )) -#define ADDONSMENUITEM_PROPERTYNAME_TITLE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_TITLE )) -#define ADDONSMENUITEM_PROPERTYNAME_TARGET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_TARGET )) -#define ADDONSMENUITEM_PROPERTYNAME_IMAGEIDENTIFIER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_IMAGEIDENTIFIER )) -#define ADDONSMENUITEM_PROPERTYNAME_CONTEXT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_CONTEXT )) -#define ADDONSMENUITEM_PROPERTYNAME_SUBMENU ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_SUBMENU )) -#define ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_CONTROLTYPE )) -#define ADDONSMENUITEM_PROPERTYNAME_WIDTH ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_WIDTH )) +#define ADDONSMENUITEM_PROPERTYNAME_URL OUString(ADDONSMENUITEM_STRING_URL ) +#define ADDONSMENUITEM_PROPERTYNAME_TITLE OUString(ADDONSMENUITEM_STRING_TITLE ) +#define ADDONSMENUITEM_PROPERTYNAME_TARGET OUString(ADDONSMENUITEM_STRING_TARGET ) +#define ADDONSMENUITEM_PROPERTYNAME_IMAGEIDENTIFIER OUString(ADDONSMENUITEM_STRING_IMAGEIDENTIFIER ) +#define ADDONSMENUITEM_PROPERTYNAME_CONTEXT OUString(ADDONSMENUITEM_STRING_CONTEXT ) +#define ADDONSMENUITEM_PROPERTYNAME_SUBMENU OUString(ADDONSMENUITEM_STRING_SUBMENU ) +#define ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE OUString(ADDONSMENUITEM_STRING_CONTROLTYPE ) +#define ADDONSMENUITEM_PROPERTYNAME_WIDTH OUString(ADDONSMENUITEM_STRING_WIDTH ) #define ADDONSPOPUPMENU_URL_PREFIX_STR "private:menu/Addon" -#define ADDONSPOPUPMENU_URL_PREFIX ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ADDONSPOPUPMENU_URL_PREFIX_STR )) +#define ADDONSPOPUPMENU_URL_PREFIX OUString( ADDONSPOPUPMENU_URL_PREFIX_STR ) namespace framework { @@ -71,23 +71,23 @@ typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com: struct FWE_DLLPUBLIC MergeMenuInstruction { - ::rtl::OUString aMergePoint; - ::rtl::OUString aMergeCommand; - ::rtl::OUString aMergeCommandParameter; - ::rtl::OUString aMergeFallback; - ::rtl::OUString aMergeContext; + OUString aMergePoint; + OUString aMergeCommand; + OUString aMergeCommandParameter; + OUString aMergeFallback; + OUString aMergeContext; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > aMergeMenu; }; typedef ::std::vector< MergeMenuInstruction > MergeMenuInstructionContainer; struct FWE_DLLPUBLIC MergeToolbarInstruction { - ::rtl::OUString aMergeToolbar; - ::rtl::OUString aMergePoint; - ::rtl::OUString aMergeCommand; - ::rtl::OUString aMergeCommandParameter; - ::rtl::OUString aMergeFallback; - ::rtl::OUString aMergeContext; + OUString aMergeToolbar; + OUString aMergePoint; + OUString aMergeCommand; + OUString aMergeCommandParameter; + OUString aMergeFallback; + OUString aMergeContext; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > aMergeToolbarItems; }; @@ -235,7 +235,7 @@ class FWE_DLLPUBLIC AddonsOptions @onerror We return sal_False *//*-*****************************************************************************************************/ - const ::rtl::OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const; + const OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const; /*-****************************************************************************************************//** @short Retrieves all available merge instructions for the Office menu bar @@ -260,7 +260,7 @@ class FWE_DLLPUBLIC AddonsOptions @onerror We return sal_False *//*-*****************************************************************************************************/ - bool GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbar ) const; + bool GetMergeToolbarInstructions( const OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbar ) const; /*-****************************************************************************************************//** @short Gets the Add-On help menu part of all addon components registered @@ -286,8 +286,8 @@ class FWE_DLLPUBLIC AddonsOptions @onerror An empty image *//*-*****************************************************************************************************/ - Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const; - Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig ) const; + Image GetImageFromURL( const OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const; + Image GetImageFromURL( const OUString& aURL, sal_Bool bBig ) const; //------------------------------------------------------------------------------------------------------------- // private methods diff --git a/framework/inc/framework/menuconfiguration.hxx b/framework/inc/framework/menuconfiguration.hxx index 9b6eb7439016..1ccd6ba0d167 100644 --- a/framework/inc/framework/menuconfiguration.hxx +++ b/framework/inc/framework/menuconfiguration.hxx @@ -34,8 +34,8 @@ #include <vcl/menu.hxx> #include <vcl/toolbox.hxx> -#define BOOKMARK_NEWMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_bookmark_new" )) -#define BOOKMARK_WIZARDMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_bookmark_wizard" )) +#define BOOKMARK_NEWMENU OUString( "private:menu_bookmark_new" ) +#define BOOKMARK_WIZARDMENU OUString( "private:menu_bookmark_wizard" ) // Prepare for inclusion by framework and sfx // Please consider that there is a corresponding define also in sfxsids.hrc!! (SID_SFX_START)/(SID_ADDONS) @@ -60,11 +60,11 @@ class FWE_DLLPUBLIC MenuConfiguration struct Attributes { Attributes() {} - Attributes( const ::rtl::OUString& aFrame, const ::rtl::OUString& aImageIdStr ) : + Attributes( const OUString& aFrame, const OUString& aImageIdStr ) : aTargetFrame( aFrame ), aImageId( aImageIdStr ) {} - ::rtl::OUString aTargetFrame; - ::rtl::OUString aImageId; + OUString aTargetFrame; + OUString aImageId; ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > xDispatchProvider; sal_Int16 nStyle; }; @@ -81,7 +81,7 @@ class FWE_DLLPUBLIC MenuConfiguration PopupMenu* CreateBookmarkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::rtl::OUString& aURL ) + const OUString& aURL ) throw ( ::com::sun::star::lang::WrappedTargetException ); ToolBox* CreateToolBoxFromConfiguration( diff --git a/framework/inc/macros/generic.hxx b/framework/inc/macros/generic.hxx index b64289cb945d..2b0e918d048d 100644 --- a/framework/inc/macros/generic.hxx +++ b/framework/inc/macros/generic.hxx @@ -35,7 +35,7 @@ _________________________________________________________________________________________________________________*/ #define DECLARE_ASCII( SASCIIVALUE ) \ - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SASCIIVALUE ) ) + OUString( SASCIIVALUE ) /*_________________________________________________________________________________________________________________ U2B( SUNICODEVALUE ) @@ -45,7 +45,7 @@ ________________________________________________________________________________ _________________________________________________________________________________________________________________*/ #define U2B( SUNICODEVALUE ) \ - ::rtl::OUStringToOString( SUNICODEVALUE, RTL_TEXTENCODING_UTF8 ) + OUStringToOString( SUNICODEVALUE, RTL_TEXTENCODING_UTF8 ) #endif // #ifndef __FRAMEWORK_MACROS_GENERIC_HXX_ diff --git a/framework/inc/properties.h b/framework/inc/properties.h index 31052a24820e..8b706833f0d0 100644 --- a/framework/inc/properties.h +++ b/framework/inc/properties.h @@ -106,30 +106,30 @@ namespace framework{ #define PATHSETTINGS_PROPNAME_ASCII_USERDICTIONARY "UserDictionary" #define PATHSETTINGS_PROPNAME_ASCII_WORK "Work" -#define PATHSETTINGS_PROPNAME_ADDIN ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_ADDIN)) -#define PATHSETTINGS_PROPNAME_AUTOCORRECT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_AUTOCORRECT)) -#define PATHSETTINGS_PROPNAME_AUTOTEXT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_AUTOTEXT)) -#define PATHSETTINGS_PROPNAME_BACKUP ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_BACKUP)) -#define PATHSETTINGS_PROPNAME_BASIC ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_BASIC)) -#define PATHSETTINGS_PROPNAME_BITMAP ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_BITMAP)) -#define PATHSETTINGS_PROPNAME_CONFIG ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_CONFIG)) -#define PATHSETTINGS_PROPNAME_DICTIONARY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_DICTIONARY)) -#define PATHSETTINGS_PROPNAME_FAVORITE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_FAVORITE)) -#define PATHSETTINGS_PROPNAME_FILTER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_FILTER)) -#define PATHSETTINGS_PROPNAME_GALLERY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_GALLERY)) -#define PATHSETTINGS_PROPNAME_GRAPHIC ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_GRAPHIC)) -#define PATHSETTINGS_PROPNAME_HELP ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_HELP)) -#define PATHSETTINGS_PROPNAME_LINGUISTIC ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_LINGUISTIC)) -#define PATHSETTINGS_PROPNAME_MODULE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_MODULE)) -#define PATHSETTINGS_PROPNAME_PALETTE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_PALETTE)) -#define PATHSETTINGS_PROPNAME_PLUGIN ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_PLUGIN)) -#define PATHSETTINGS_PROPNAME_STORAGE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_STORAGE)) -#define PATHSETTINGS_PROPNAME_TEMP ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_TEMP)) -#define PATHSETTINGS_PROPNAME_TEMPLATE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_TEMPLATE)) -#define PATHSETTINGS_PROPNAME_UICONFIG ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_UICONFIG)) -#define PATHSETTINGS_PROPNAME_USERCONFIG ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_USERCONFIG)) -#define PATHSETTINGS_PROPNAME_USERDICTIONARY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_USERDICTIONARY)) -#define PATHSETTINGS_PROPNAME_WORK ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_WORK)) +#define PATHSETTINGS_PROPNAME_ADDIN OUString(PATHSETTINGS_PROPNAME_ASCII_ADDIN) +#define PATHSETTINGS_PROPNAME_AUTOCORRECT OUString(PATHSETTINGS_PROPNAME_ASCII_AUTOCORRECT) +#define PATHSETTINGS_PROPNAME_AUTOTEXT OUString(PATHSETTINGS_PROPNAME_ASCII_AUTOTEXT) +#define PATHSETTINGS_PROPNAME_BACKUP OUString(PATHSETTINGS_PROPNAME_ASCII_BACKUP) +#define PATHSETTINGS_PROPNAME_BASIC OUString(PATHSETTINGS_PROPNAME_ASCII_BASIC) +#define PATHSETTINGS_PROPNAME_BITMAP OUString(PATHSETTINGS_PROPNAME_ASCII_BITMAP) +#define PATHSETTINGS_PROPNAME_CONFIG OUString(PATHSETTINGS_PROPNAME_ASCII_CONFIG) +#define PATHSETTINGS_PROPNAME_DICTIONARY OUString(PATHSETTINGS_PROPNAME_ASCII_DICTIONARY) +#define PATHSETTINGS_PROPNAME_FAVORITE OUString(PATHSETTINGS_PROPNAME_ASCII_FAVORITE) +#define PATHSETTINGS_PROPNAME_FILTER OUString(PATHSETTINGS_PROPNAME_ASCII_FILTER) +#define PATHSETTINGS_PROPNAME_GALLERY OUString(PATHSETTINGS_PROPNAME_ASCII_GALLERY) +#define PATHSETTINGS_PROPNAME_GRAPHIC OUString(PATHSETTINGS_PROPNAME_ASCII_GRAPHIC) +#define PATHSETTINGS_PROPNAME_HELP OUString(PATHSETTINGS_PROPNAME_ASCII_HELP) +#define PATHSETTINGS_PROPNAME_LINGUISTIC OUString(PATHSETTINGS_PROPNAME_ASCII_LINGUISTIC) +#define PATHSETTINGS_PROPNAME_MODULE OUString(PATHSETTINGS_PROPNAME_ASCII_MODULE) +#define PATHSETTINGS_PROPNAME_PALETTE OUString(PATHSETTINGS_PROPNAME_ASCII_PALETTE) +#define PATHSETTINGS_PROPNAME_PLUGIN OUString(PATHSETTINGS_PROPNAME_ASCII_PLUGIN) +#define PATHSETTINGS_PROPNAME_STORAGE OUString(PATHSETTINGS_PROPNAME_ASCII_STORAGE) +#define PATHSETTINGS_PROPNAME_TEMP OUString(PATHSETTINGS_PROPNAME_ASCII_TEMP) +#define PATHSETTINGS_PROPNAME_TEMPLATE OUString(PATHSETTINGS_PROPNAME_ASCII_TEMPLATE) +#define PATHSETTINGS_PROPNAME_UICONFIG OUString(PATHSETTINGS_PROPNAME_ASCII_UICONFIG) +#define PATHSETTINGS_PROPNAME_USERCONFIG OUString(PATHSETTINGS_PROPNAME_ASCII_USERCONFIG) +#define PATHSETTINGS_PROPNAME_USERDICTIONARY OUString(PATHSETTINGS_PROPNAME_ASCII_USERDICTIONARY) +#define PATHSETTINGS_PROPNAME_WORK OUString(PATHSETTINGS_PROPNAME_ASCII_WORK) // Please add new entries alphabetical sorted and correct all other handles! // Start counting with 0, so it can be used as direct index into an array too. @@ -171,12 +171,12 @@ namespace framework{ #define LAYOUTMANAGER_PROPNAME_ASCII_LOCKCOUNT "LockCount" #define LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_SIZE "PreserveContentSize" -#define LAYOUTMANAGER_PROPNAME_MENUBARCLOSER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER )) -#define LAYOUTMANAGER_PROPNAME_AUTOMATICTOOLBARS ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LAYOUTMANAGER_PROPNAME_ASCII_AUTOMATICTOOLBARS )) -#define LAYOUTMANAGER_PROPNAME_REFRESHVISIBILITY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LAYOUTMANAGER_PROPNAME_ASCII_REFRESHVISIBILITY )) -#define LAYOUTMANAGER_PROPNAME_HIDECURRENTUI ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LAYOUTMANAGER_PROPNAME_ASCII_HIDECURRENTUI )) -#define LAYOUTMANAGER_PROPNAME_LOCKCOUNT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LAYOUTMANAGER_PROPNAME_ASCII_LOCKCOUNT )) -#define LAYOUTMANAGER_PROPNAME_PRESERVE_CONTENT_SIZE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_SIZE )) +#define LAYOUTMANAGER_PROPNAME_MENUBARCLOSER OUString( LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER ) +#define LAYOUTMANAGER_PROPNAME_AUTOMATICTOOLBARS OUString( LAYOUTMANAGER_PROPNAME_ASCII_AUTOMATICTOOLBARS ) +#define LAYOUTMANAGER_PROPNAME_REFRESHVISIBILITY OUString( LAYOUTMANAGER_PROPNAME_ASCII_REFRESHVISIBILITY ) +#define LAYOUTMANAGER_PROPNAME_HIDECURRENTUI OUString( LAYOUTMANAGER_PROPNAME_ASCII_HIDECURRENTUI ) +#define LAYOUTMANAGER_PROPNAME_LOCKCOUNT OUString( LAYOUTMANAGER_PROPNAME_ASCII_LOCKCOUNT ) +#define LAYOUTMANAGER_PROPNAME_PRESERVE_CONTENT_SIZE OUString( LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_SIZE ) #define LAYOUTMANAGER_PROPHANDLE_MENUBARCLOSER 0 #define LAYOUTMANAGER_PROPHANDLE_AUTOMATICTOOLBARS 1 @@ -206,9 +206,9 @@ namespace framework{ #define AUTORECOVERY_PROPNAME_ASCII_EXISTS_SESSIONDATA "ExistsSessionData" #define AUTORECOVERY_PROPNAME_ASCII_CRASHED "Crashed" -#define AUTORECOVERY_PROPNAME_EXISTS_RECOVERYDATA ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AUTORECOVERY_PROPNAME_ASCII_EXISTS_RECOVERYDATA )) -#define AUTORECOVERY_PROPNAME_EXISTS_SESSIONDATA ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AUTORECOVERY_PROPNAME_ASCII_EXISTS_SESSIONDATA )) -#define AUTORECOVERY_PROPNAME_CRASHED ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AUTORECOVERY_PROPNAME_ASCII_CRASHED )) +#define AUTORECOVERY_PROPNAME_EXISTS_RECOVERYDATA OUString( AUTORECOVERY_PROPNAME_ASCII_EXISTS_RECOVERYDATA ) +#define AUTORECOVERY_PROPNAME_EXISTS_SESSIONDATA OUString( AUTORECOVERY_PROPNAME_ASCII_EXISTS_SESSIONDATA ) +#define AUTORECOVERY_PROPNAME_CRASHED OUString( AUTORECOVERY_PROPNAME_ASCII_CRASHED ) #define AUTORECOVERY_PROPHANDLE_EXISTS_RECOVERYDATA 0 #define AUTORECOVERY_PROPHANDLE_EXISTS_SESSIONDATA 1 @@ -221,7 +221,7 @@ namespace framework{ #define FILTER_PROPNAME_ASCII_DOCUMENTSERVICE "DocumentService" -#define FILTER_PROPNAME_DOCUMENTSERVICE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILTER_PROPNAME_ASCII_DOCUMENTSERVICE )) +#define FILTER_PROPNAME_DOCUMENTSERVICE OUString( FILTER_PROPNAME_ASCII_DOCUMENTSERVICE ) //_______________________________________________ /** properties for office module config (Setup.xcu) */ @@ -230,16 +230,16 @@ namespace framework{ #define OFFICEFACTORY_PROPNAME_ASCII_UINAME "ooSetupFactoryUIName" #define OFFICEFACTORY_PROPNAME_ASCII_ICON "ooSetupFactoryIcon" -#define OFFICEFACTORY_PROPNAME_WINDOWATTRIBUTES ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES )) -#define OFFICEFACTORY_PROPNAME_UINAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( OFFICEFACTORY_PROPNAME_ASCII_UINAME )) -#define OFFICEFACTORY_PROPNAME_ICON ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( OFFICEFACTORY_PROPNAME_ASCII_ICON )) +#define OFFICEFACTORY_PROPNAME_WINDOWATTRIBUTES OUString( OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES ) +#define OFFICEFACTORY_PROPNAME_UINAME OUString( OFFICEFACTORY_PROPNAME_ASCII_UINAME ) +#define OFFICEFACTORY_PROPNAME_ICON OUString( OFFICEFACTORY_PROPNAME_ASCII_ICON ) //_______________________________________________ /** properties for tab window (old) */ #define TABWINDOW_PROPNAME_ASCII_PARENTWINDOW "ParentWindow" #define TABWINDOW_PROPNAME_ASCII_TOPWINDOW "TopWindow" -#define TABWINDOW_PROPNAME_PARENTWINDOW ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TABWINDOW_PROPNAME_ASCII_PARENTWINDOW )) -#define TABWINDOW_PROPNAME_TOPWINDOW ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TABWINDOW_PROPNAME_ASCII_TOPWINDOW )) +#define TABWINDOW_PROPNAME_PARENTWINDOW OUString( TABWINDOW_PROPNAME_ASCII_PARENTWINDOW ) +#define TABWINDOW_PROPNAME_TOPWINDOW OUString( TABWINDOW_PROPNAME_ASCII_TOPWINDOW ) #define TABWINDOW_PROPHANDLE_PARENTWINDOW 0 #define TABWINDOW_PROPHANDLE_TOPWINDOW 1 diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 185bebe3eabd..a72204f8aa1c 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -71,7 +71,7 @@ class StringLength : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XSt virtual ~StringLength() {} // XStringWidth - sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& aString ) + sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) throw (::com::sun::star::uno::RuntimeException) { return aString.getLength(); @@ -130,7 +130,7 @@ MenuManager::MenuManager( sal_uInt16 nItemCount = pMenu->GetItemCount(); m_aMenuItemHandlerVector.reserve(nItemCount); - ::rtl::OUString aItemCommand; + OUString aItemCommand; for ( sal_uInt16 i = 0; i < nItemCount; i++ ) { sal_uInt16 nItemId = FillItemCommand(aItemCommand,pMenu, i ); @@ -168,12 +168,12 @@ MenuManager::MenuManager( pPopupMenu->SetPopupMenu( ITEMID_ADDONLIST, pSubMenu ); // Set item command for popup menu to enable it for GetImageFromURL - const static ::rtl::OUString aSlotString( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + const static OUString aSlotString( "slot:" ); aItemCommand = aSlotString; - aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)ITEMID_ADDONLIST ); + aItemCommand += OUString::valueOf( (sal_Int32)ITEMID_ADDONLIST ); pPopupMenu->SetItemCommand( ITEMID_ADDONLIST, aItemCommand ); - AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False); + AddMenu(pSubMenu,OUString(),nItemId,sal_True,sal_False); // Set image for the addon popup menu item if ( bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST )) { @@ -195,7 +195,7 @@ MenuManager::MenuManager( BmkMenu* pSubMenu = (BmkMenu*)aMenuCfg.CreateBookmarkMenu( rFrame, BOOKMARK_NEWMENU ); pMenu->SetPopupMenu( nItemId, pSubMenu ); - AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False); + AddMenu(pSubMenu,OUString(),nItemId,sal_True,sal_False); if ( bShowMenuImages && !pMenu->GetItemImage( nItemId )) { Image aImage = GetImageFromURL( rFrame, aItemCommand, false ); @@ -209,7 +209,7 @@ MenuManager::MenuManager( BmkMenu* pSubMenu = (BmkMenu*)aMenuCfg.CreateBookmarkMenu( rFrame, BOOKMARK_WIZARDMENU ); pMenu->SetPopupMenu( nItemId, pSubMenu ); - AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False); + AddMenu(pSubMenu,OUString(),nItemId,sal_True,sal_False); if ( bShowMenuImages && !pMenu->GetItemImage( nItemId )) @@ -227,7 +227,7 @@ MenuManager::MenuManager( { // Add-Ons uses a images from different places Image aImage; - rtl::OUString aImageId; + OUString aImageId; MenuConfiguration::Attributes* pMenuAttributes = (MenuConfiguration::Attributes*)pMenu->GetUserValue( nItemId ); @@ -316,7 +316,7 @@ MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( sal_uInt16 nItemI void SAL_CALL MenuManager::statusChanged( const FEATURSTATEEVENT& Event ) throw ( RuntimeException ) { - ::rtl::OUString aFeatureURL = Event.FeatureURL.Complete; + OUString aFeatureURL = Event.FeatureURL.Complete; MenuItemHandler* pStatusChangedMenu = NULL; { @@ -363,7 +363,7 @@ throw ( RuntimeException ) REFERENCE< XDISPATCHPROVIDER > xDispatchProvider( m_xFrame, UNO_QUERY ); REFERENCE< XDISPATCH > xMenuItemDispatch = xDispatchProvider->queryDispatch( - aTargetURL, ::rtl::OUString(), 0 ); + aTargetURL, OUString(), 0 ); if ( xMenuItemDispatch.is() ) { @@ -499,7 +499,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) REFERENCE< XDISPATCH > xMenuItemDispatch; - static const ::rtl::OUString s_sDefault(RTL_CONSTASCII_USTRINGPARAM("_default")); + static const OUString s_sDefault("_default"); // query for dispatcher std::vector< MenuItemHandler* >::iterator p; for ( p = aNewPickVector.begin(); p != aNewPickVector.end(); ++p ) @@ -561,27 +561,27 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) { char menuShortCut[5] = "~n: "; - ::rtl::OUString aMenuShortCut; + OUString aMenuShortCut; if ( i <= 9 ) { if ( i == 9 ) - aMenuShortCut = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "1~0: " )); + aMenuShortCut = OUString( "1~0: " ); else { menuShortCut[1] = (char)( '1' + i ); - aMenuShortCut = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( menuShortCut )); + aMenuShortCut = OUString( RTL_CONSTASCII_USTRINGPARAM( menuShortCut ) ); } } else { - aMenuShortCut = rtl::OUString::valueOf((sal_Int32)( i + 1 )); - aMenuShortCut += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": " )); + aMenuShortCut = OUString::valueOf((sal_Int32)( i + 1 )); + aMenuShortCut += OUString( ": " ); } // Abbreviate URL - rtl::OUString aURLString( aNewPickVector.at( i )->aMenuItemURL ); - rtl::OUString aTipHelpText; - rtl::OUString aMenuTitle; + OUString aURLString( aNewPickVector.at( i )->aMenuItemURL ); + OUString aTipHelpText; + OUString aMenuTitle; INetURLObject aURL( aURLString ); if ( aURL.GetProtocol() == INET_PROT_FILE ) @@ -590,8 +590,8 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) // path and abbreviate it with a special function: String aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) ); - ::rtl::OUString aSystemPath( aFileSystemPath ); - ::rtl::OUString aCompactedSystemPath; + OUString aSystemPath( aFileSystemPath ); + OUString aCompactedSystemPath; aTipHelpText = aSystemPath; oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL ); @@ -609,7 +609,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) aTipHelpText = aURLString; } - ::rtl::OUString aTitle( aMenuShortCut + aMenuTitle ); + OUString aTitle( aMenuShortCut + aMenuTitle ); MenuItemHandler* pMenuItemHandler = aNewPickVector.at( i ); pMenu->InsertItem( pMenuItemHandler->nItemId, aTitle ); @@ -623,7 +623,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XComponentContext >& xContext,framework::IMutex& _rMutex ) { // update window list - ::std::vector< ::rtl::OUString > aNewWindowListVector; + ::std::vector< OUString > aNewWindowListVector; Reference< XDesktop2 > xDesktop = Desktop::create( xContext ); @@ -694,25 +694,25 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList, Any a; aArgsList.realloc( NUM_OF_PICKLIST_ARGS ); - aArgsList[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" )); + aArgsList[0].Name = OUString( "FileName" ); a <<= pMenuItemHandler->aMenuItemURL; aArgsList[0].Value = a; - aArgsList[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" )); - a <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )); + aArgsList[1].Name = OUString( "Referer" ); + a <<= OUString( SFX_REFERER_USER ); aArgsList[1].Value = a; - ::rtl::OUString aFilter( pMenuItemHandler->aFilter ); + OUString aFilter( pMenuItemHandler->aFilter ); sal_Int32 nPos = aFilter.indexOf( '|' ); if ( nPos >= 0 ) { - ::rtl::OUString aFilterOptions; + OUString aFilterOptions; if ( nPos < ( aFilter.getLength() - 1 ) ) aFilterOptions = aFilter.copy( nPos+1 ); - aArgsList[2].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterOptions" )); + aArgsList[2].Name = OUString( "FilterOptions" ); a <<= aFilterOptions; aArgsList[2].Value = a; @@ -720,7 +720,7 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList, aArgsList.realloc( ++NUM_OF_PICKLIST_ARGS ); } - aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" )); + aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = OUString( "FilterName" ); a <<= aFilter; aArgsList[NUM_OF_PICKLIST_ARGS-1].Value = a; } @@ -751,7 +751,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) m_bActive = sal_True; - ::rtl::OUString aCommand( m_aMenuItemCommand ); + OUString aCommand( m_aMenuItemCommand ); if (m_aMenuItemCommand.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(UNO_COMMAND))) { // Remove protocol part from command so we can use an easier comparision method @@ -795,12 +795,12 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) if ( pMenuItemHandler->nItemId < START_ITEMID_WINDOWLIST || pMenuItemHandler->nItemId > END_ITEMID_WINDOWLIST ) { - ::rtl::OUString aItemCommand = pMenu->GetItemCommand( pMenuItemHandler->nItemId ); + OUString aItemCommand = pMenu->GetItemCommand( pMenuItemHandler->nItemId ); if ( aItemCommand.isEmpty() ) { - const static ::rtl::OUString aSlotString( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + const static OUString aSlotString( "slot:" ); aItemCommand = aSlotString; - aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)pMenuItemHandler->nItemId ); + aItemCommand += OUString::valueOf( (sal_Int32)pMenuItemHandler->nItemId ); pMenu->SetItemCommand( pMenuItemHandler->nItemId, aItemCommand ); } @@ -812,7 +812,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) if ( m_bIsBookmarkMenu ) xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, pMenuItemHandler->aTargetFrame, 0 ); else - xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); if ( xMenuItemDispatch.is() ) { @@ -899,8 +899,8 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu ) { // bookmark menu item selected aArgs.realloc( 1 ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" )); - aArgs[0].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )); + aArgs[0].Name = OUString( "Referer" ); + aArgs[0].Value <<= OUString( SFX_REFERER_USER ); } xDispatch = pMenuItemHandler->xMenuItemDispatch; @@ -926,7 +926,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext return m_xContext; } -void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren) +void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren) { MenuManager* pSubMenuManager = new MenuManager( m_xContext, m_xFrame, _pPopupMenu, _bDelete, _bDeleteChildren ); @@ -941,16 +941,16 @@ void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCo m_aMenuItemHandlerVector.push_back( pMenuItemHandler ); } -sal_uInt16 MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const +sal_uInt16 MenuManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const { sal_uInt16 nItemId = _pMenu->GetItemId( _nIndex ); _rItemCommand = _pMenu->GetItemCommand( nItemId ); if ( _rItemCommand.isEmpty() ) { - const static ::rtl::OUString aSlotString( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + const static OUString aSlotString( "slot:" ); _rItemCommand = aSlotString; - _rItemCommand += ::rtl::OUString::valueOf( (sal_Int32)nItemId ); + _rItemCommand += OUString::valueOf( (sal_Int32)nItemId ); _pMenu->SetItemCommand( nItemId, _rItemCommand ); } return nItemId; @@ -975,7 +975,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame, Menu* _pMenu,sal_ if ( bTmpShowMenuImages ) { sal_Bool bImageSet = sal_False; - ::rtl::OUString aImageId; + OUString aImageId; ::framework::MenuConfiguration::Attributes* pMenuAttributes = (::framework::MenuConfiguration::Attributes*)_pMenu->GetUserValue( nId ); @@ -995,7 +995,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame, Menu* _pMenu,sal_ if ( !bImageSet ) { - rtl::OUString aMenuItemCommand = _pMenu->GetItemCommand( nId ); + OUString aMenuItemCommand = _pMenu->GetItemCommand( nId ); Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, false ); if ( !aImage ) aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, false ); diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index afc8c7c16714..30b271f30a06 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -108,31 +108,31 @@ DEFINE_XTYPEPROVIDER_7 ( PopupMenuDispatcher , XFrameActionListener ) -::rtl::OUString SAL_CALL PopupMenuDispatcher::getImplementationName() throw( css::uno::RuntimeException ) +OUString SAL_CALL PopupMenuDispatcher::getImplementationName() throw( css::uno::RuntimeException ) { return impl_getStaticImplementationName(); } -sal_Bool SAL_CALL PopupMenuDispatcher::supportsService( const ::rtl::OUString& sServiceName ) +sal_Bool SAL_CALL PopupMenuDispatcher::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException ) { return ::comphelper::findValue(getSupportedServiceNames(), sServiceName, sal_True).getLength() != 0; } -css::uno::Sequence< ::rtl::OUString > SAL_CALL PopupMenuDispatcher::getSupportedServiceNames() +css::uno::Sequence< OUString > SAL_CALL PopupMenuDispatcher::getSupportedServiceNames() throw( css::uno::RuntimeException ) { return impl_getStaticSupportedServiceNames(); } -css::uno::Sequence< ::rtl::OUString > PopupMenuDispatcher::impl_getStaticSupportedServiceNames() +css::uno::Sequence< OUString > PopupMenuDispatcher::impl_getStaticSupportedServiceNames() { - css::uno::Sequence< ::rtl::OUString > seqServiceNames( 1 ); + css::uno::Sequence< OUString > seqServiceNames( 1 ); seqServiceNames.getArray() [0] = SERVICENAME_PROTOCOLHANDLER; return seqServiceNames; } -::rtl::OUString PopupMenuDispatcher::impl_getStaticImplementationName() +OUString PopupMenuDispatcher::impl_getStaticImplementationName() { return IMPLEMENTATIONNAME_POPUPMENUDISPATCHER; } @@ -210,7 +210,7 @@ throw( css::uno::Exception, css::uno::RuntimeException) css::uno::Reference< css::frame::XDispatch > SAL_CALL PopupMenuDispatcher::queryDispatch( const css::util::URL& rURL , - const ::rtl::OUString& sTarget , + const OUString& sTarget , sal_Int32 nFlags ) throw( css::uno::RuntimeException ) { @@ -235,8 +235,8 @@ throw( css::uno::RuntimeException ) // Just use the main part of the URL for popup menu controllers sal_Int32 nQueryPart( 0 ); sal_Int32 nSchemePart( 0 ); - rtl::OUString aBaseURL( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.popup:" )); - rtl::OUString aURL( rURL.Complete ); + OUString aBaseURL( "vnd.sun.star.popup:" ); + OUString aURL( rURL.Complete ); nSchemePart = aURL.indexOf( ':' ); if (( nSchemePart > 0 ) && @@ -399,7 +399,7 @@ void PopupMenuDispatcher::impl_RetrievePopupControllerQuery() if ( xLayoutManager.is() ) { css::uno::Reference< css::ui::XUIElement > xMenuBar; - rtl::OUString aMenuBar( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" )); + OUString aMenuBar( "private:resource/menubar/menubar" ); xMenuBar = xLayoutManager->getElement( aMenuBar ); m_xPopupCtrlQuery = css::uno::Reference< css::container::XNameAccess >( diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx index 0a2efcf76c46..974a8d1b7207 100644 --- a/framework/source/fwe/classes/actiontriggercontainer.cxx +++ b/framework/source/fwe/classes/actiontriggercontainer.cxx @@ -71,7 +71,7 @@ void ActionTriggerContainer::release() throw() // XMultiServiceFactory -Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstance( const ::rtl::OUString& aServiceSpecifier ) +Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstance( const OUString& aServiceSpecifier ) throw ( ::com::sun::star::uno::Exception, RuntimeException) { if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGER )) @@ -81,37 +81,37 @@ throw ( ::com::sun::star::uno::Exception, RuntimeException) else if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGERSEPARATOR )) return (OWeakObject *)( new ActionTriggerSeparatorPropertySet()); else - throw com::sun::star::uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unknown service specifier!" )), (OWeakObject *)this ); + throw com::sun::star::uno::RuntimeException( OUString( "Unknown service specifier!" ), (OWeakObject *)this ); } -Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) +Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) throw ( Exception, RuntimeException) { return createInstance( ServiceSpecifier ); } -Sequence< ::rtl::OUString > SAL_CALL ActionTriggerContainer::getAvailableServiceNames() +Sequence< OUString > SAL_CALL ActionTriggerContainer::getAvailableServiceNames() throw ( RuntimeException ) { - Sequence< ::rtl::OUString > aSeq( 3 ); + Sequence< OUString > aSeq( 3 ); - aSeq[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGER )); - aSeq[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERCONTAINER )); - aSeq[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERSEPARATOR )); + aSeq[0] = OUString( SERVICENAME_ACTIONTRIGGER ); + aSeq[1] = OUString( SERVICENAME_ACTIONTRIGGERCONTAINER ); + aSeq[2] = OUString( SERVICENAME_ACTIONTRIGGERSEPARATOR ); return aSeq; } // XServiceInfo -::rtl::OUString SAL_CALL ActionTriggerContainer::getImplementationName() +OUString SAL_CALL ActionTriggerContainer::getImplementationName() throw ( RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER )); + return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER ); } -sal_Bool SAL_CALL ActionTriggerContainer::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL ActionTriggerContainer::supportsService( const OUString& ServiceName ) throw ( RuntimeException ) { if ( ServiceName.equalsAscii( SERVICENAME_ACTIONTRIGGERCONTAINER )) @@ -120,12 +120,12 @@ throw ( RuntimeException ) return sal_False; } -Sequence< ::rtl::OUString > SAL_CALL ActionTriggerContainer::getSupportedServiceNames() +Sequence< OUString > SAL_CALL ActionTriggerContainer::getSupportedServiceNames() throw ( RuntimeException ) { - Sequence< ::rtl::OUString > seqServiceNames( 1 ); + Sequence< OUString > seqServiceNames( 1 ); - seqServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERCONTAINER )); + seqServiceNames[0] = OUString( SERVICENAME_ACTIONTRIGGERCONTAINER ); return seqServiceNames; } diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index bcde553aa713..a10f90a584ae 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -99,13 +99,13 @@ void SAL_CALL ActionTriggerPropertySet::release() throw () // XServiceInfo -::rtl::OUString SAL_CALL ActionTriggerPropertySet::getImplementationName() +OUString SAL_CALL ActionTriggerPropertySet::getImplementationName() throw ( RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATIONNAME_ACTIONTRIGGER )); + return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGER ); } -sal_Bool SAL_CALL ActionTriggerPropertySet::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL ActionTriggerPropertySet::supportsService( const OUString& ServiceName ) throw ( RuntimeException ) { if ( ServiceName.equalsAscii( SERVICENAME_ACTIONTRIGGER )) @@ -114,11 +114,11 @@ throw ( RuntimeException ) return sal_False; } -Sequence< ::rtl::OUString > SAL_CALL ActionTriggerPropertySet::getSupportedServiceNames() +Sequence< OUString > SAL_CALL ActionTriggerPropertySet::getSupportedServiceNames() throw ( RuntimeException ) { - Sequence< ::rtl::OUString > seqServiceNames( 1 ); - seqServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGER )); + Sequence< OUString > seqServiceNames( 1 ); + seqServiceNames[0] = OUString( SERVICENAME_ACTIONTRIGGER ); return seqServiceNames; } @@ -343,11 +343,11 @@ const Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescr { const Property pActionTriggerPropertys[] = { - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" )), HANDLE_COMMANDURL , ::getCppuType((::rtl::OUString*)0) , PropertyAttribute::TRANSIENT ), - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" )), HANDLE_HELPURL , ::getCppuType((::rtl::OUString*)0) , PropertyAttribute::TRANSIENT ), - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Image" )), HANDLE_IMAGE , ::getCppuType((Reference<XBitmap>*)0) , PropertyAttribute::TRANSIENT ), - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SubContainer" )), HANDLE_SUBCONTAINER , ::getCppuType((::rtl::OUString*)0) , PropertyAttribute::TRANSIENT ), - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )), HANDLE_TEXT , ::getCppuType((Reference<XInterface>*)0) , PropertyAttribute::TRANSIENT ) + Property( OUString( "CommandURL" ), HANDLE_COMMANDURL , ::getCppuType((OUString*)0) , PropertyAttribute::TRANSIENT ), + Property( OUString( "HelpURL" ), HANDLE_HELPURL , ::getCppuType((OUString*)0) , PropertyAttribute::TRANSIENT ), + Property( OUString( "Image" ), HANDLE_IMAGE , ::getCppuType((Reference<XBitmap>*)0) , PropertyAttribute::TRANSIENT ), + Property( OUString( "SubContainer" ), HANDLE_SUBCONTAINER , ::getCppuType((OUString*)0) , PropertyAttribute::TRANSIENT ), + Property( OUString( "Text" ), HANDLE_TEXT , ::getCppuType((Reference<XInterface>*)0) , PropertyAttribute::TRANSIENT ) }; // Use it to initialize sequence! @@ -362,7 +362,7 @@ const Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescr // private method //****************************************************************************************************************************** sal_Bool ActionTriggerPropertySet::impl_tryToChangeProperty( - const ::rtl::OUString& sCurrentValue , + const OUString& sCurrentValue , const Any& aNewValue , Any& aOldValue , Any& aConvertedValue ) @@ -372,7 +372,7 @@ throw( IllegalArgumentException ) sal_Bool bReturn = sal_False; // Get new value from any. // IllegalArgumentException() can be thrown! - ::rtl::OUString sValue ; + OUString sValue ; convertPropertyValue( sValue, aNewValue ); // If value change ... diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index c5b33ad2687c..75afc5a8effb 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -91,13 +91,13 @@ void ActionTriggerSeparatorPropertySet::release() throw() } // XServiceInfo -::rtl::OUString SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationName() +OUString SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationName() throw ( RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR )); + return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR ); } -sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::supportsService( const OUString& ServiceName ) throw ( RuntimeException ) { if ( ServiceName.equalsAscii( SERVICENAME_ACTIONTRIGGERSEPARATOR )) @@ -106,11 +106,11 @@ throw ( RuntimeException ) return sal_False; } -Sequence< ::rtl::OUString > SAL_CALL ActionTriggerSeparatorPropertySet::getSupportedServiceNames() +Sequence< OUString > SAL_CALL ActionTriggerSeparatorPropertySet::getSupportedServiceNames() throw ( RuntimeException ) { - Sequence< ::rtl::OUString > seqServiceNames( 1 ); - seqServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERSEPARATOR )); + Sequence< OUString > seqServiceNames( 1 ); + seqServiceNames[0] = OUString( SERVICENAME_ACTIONTRIGGERSEPARATOR ); return seqServiceNames; } @@ -287,7 +287,7 @@ const Sequence< Property > ActionTriggerSeparatorPropertySet::impl_getStaticProp { const Property pActionTriggerPropertys[] = { - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SeparatorType" )), HANDLE_TYPE, ::getCppuType((sal_Int16*)0), PropertyAttribute::TRANSIENT ) + Property( OUString( "SeparatorType" ), HANDLE_TYPE, ::getCppuType((sal_Int16*)0), PropertyAttribute::TRANSIENT ) }; // Use it to initialize sequence! diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index f5c5218b9677..871bfcabae2d 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -70,7 +70,7 @@ AddonMenu::~AddonMenu() // ------------------------------------------------------------------------ // Check if command URL string has the unique prefix to identify addon popup menus -sal_Bool AddonPopupMenu::IsCommandURLPrefix( const ::rtl::OUString& aCmdURL ) +sal_Bool AddonPopupMenu::IsCommandURLPrefix( const OUString& aCmdURL ) { const char aPrefixCharBuf[] = ADDONSPOPUPMENU_URL_PREFIX_STR; @@ -176,7 +176,7 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me PopupMenu* pHelpMenu = pMergeMenuBar->GetPopupMenu( SID_HELPMENU ); if ( !pHelpMenu ) { - sal_uInt16 nId = FindMenuId(pMergeMenuBar, rtl::OUString(".uno:HelpMenu")); + sal_uInt16 nId = FindMenuId(pMergeMenuBar, OUString(".uno:HelpMenu")); if ( nId != USHRT_MAX ) pHelpMenu = pMergeMenuBar->GetPopupMenu( nId ); } @@ -190,7 +190,7 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me AddonsOptions aOptions; // try to detect the about menu item with the command URL - sal_uInt16 nId = FindMenuId(pHelpMenu, rtl::OUString(".uno:About")); + sal_uInt16 nId = FindMenuId(pHelpMenu, OUString(".uno:About")); sal_uInt16 nInsPos = pHelpMenu->GetItemPos( nId ); Sequence< Sequence< PropertyValue > > aAddonSubMenu; @@ -227,11 +227,11 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame, AddonsOptions aAddonsOptions; sal_uInt16 nInsertPos = nMergeAtPos; - ::rtl::OUString aTitle; - ::rtl::OUString aURL; - ::rtl::OUString aTarget; - ::rtl::OUString aImageId; - ::rtl::OUString aContext; + OUString aTitle; + OUString aURL; + OUString aTarget; + OUString aImageId; + OUString aContext; Sequence< Sequence< PropertyValue > > aAddonSubMenu; sal_uInt16 nUniqueMenuId = ADDONMENU_ITEMID_START; @@ -287,11 +287,11 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent sal_uInt32 nCount = aAddonMenuDefinition.getLength(); AddonsOptions aAddonsOptions; - ::rtl::OUString aTitle; - ::rtl::OUString aURL; - ::rtl::OUString aTarget; - ::rtl::OUString aImageId; - ::rtl::OUString aContext; + OUString aTitle; + OUString aURL; + OUString aTarget; + OUString aImageId; + OUString aContext; for ( i = 0; i < nCount; ++i ) { @@ -300,7 +300,7 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent if ( !IsCorrectContext( rModel, aContext ) || ( aTitle.isEmpty() && aURL.isEmpty() )) continue; - if ( aURL == ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:separator" ))) + if ( aURL == OUString( "private:separator" )) bInsertSeparator = sal_True; else { @@ -348,11 +348,11 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent // Retrieve the menu entry property values from a sequence void AddonMenuManager::GetMenuEntry( const Sequence< PropertyValue >& rAddonMenuEntry, - ::rtl::OUString& rTitle, - ::rtl::OUString& rURL, - ::rtl::OUString& rTarget, - ::rtl::OUString& rImageId, - ::rtl::OUString& rContext, + OUString& rTitle, + OUString& rURL, + OUString& rTarget, + OUString& rImageId, + OUString& rContext, Sequence< Sequence< PropertyValue > >& rAddonSubMenu ) { // Reset submenu parameter @@ -360,7 +360,7 @@ void AddonMenuManager::GetMenuEntry( const Sequence< PropertyValue >& rAddonMenu for ( int i = 0; i < rAddonMenuEntry.getLength(); i++ ) { - ::rtl::OUString aMenuEntryPropName = rAddonMenuEntry[i].Name; + OUString aMenuEntryPropName = rAddonMenuEntry[i].Name; if ( aMenuEntryPropName == ADDONSMENUITEM_PROPERTYNAME_URL ) rAddonMenuEntry[i].Value >>= rURL; else if ( aMenuEntryPropName == ADDONSMENUITEM_PROPERTYNAME_TITLE ) @@ -377,7 +377,7 @@ void AddonMenuManager::GetMenuEntry( const Sequence< PropertyValue >& rAddonMenu } // Check if the context string matches the provided xModel context -sal_Bool AddonMenuManager::IsCorrectContext( const Reference< XModel >& rModel, const ::rtl::OUString& aContext ) +sal_Bool AddonMenuManager::IsCorrectContext( const Reference< XModel >& rModel, const OUString& aContext ) { if ( rModel.is() ) { @@ -387,7 +387,7 @@ sal_Bool AddonMenuManager::IsCorrectContext( const Reference< XModel >& rModel, sal_Int32 nIndex = 0; do { - ::rtl::OUString aToken = aContext.getToken( 0, ',', nIndex ); + OUString aToken = aContext.getToken( 0, ',', nIndex ); if ( xServiceInfo->supportsService( aToken )) return sal_True; diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index eeaf5847ec9a..c7a649037351 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -48,11 +48,11 @@ using namespace ::com::sun::star::beans ; using namespace ::com::sun::star::lang ; using namespace ::com::sun::star; -#define ROOTNODE_ADDONMENU OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Addons" )) -#define PATHDELIMITER OUString(RTL_CONSTASCII_USTRINGPARAM("/" )) +#define ROOTNODE_ADDONMENU OUString("Office.Addons" ) +#define PATHDELIMITER OUString("/" ) #define SEPARATOR_URL_STR "private:separator" #define SEPARATOR_URL_LEN 17 -#define SEPARATOR_URL OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATOR_URL_STR )) +#define SEPARATOR_URL OUString( SEPARATOR_URL_STR ) #define PROPERTYNAME_URL ADDONSMENUITEM_PROPERTYNAME_URL #define PROPERTYNAME_TITLE ADDONSMENUITEM_PROPERTYNAME_TITLE @@ -63,32 +63,32 @@ using namespace ::com::sun::star; #define PROPERTYNAME_CONTROLTYPE ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE #define PROPERTYNAME_WIDTH ADDONSMENUITEM_PROPERTYNAME_WIDTH -#define PROPERTYNAME_IMAGESMALL OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmall" )) -#define PROPERTYNAME_IMAGEBIG OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBig" )) -#define PROPERTYNAME_IMAGESMALLHC OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallHC" )) -#define PROPERTYNAME_IMAGEBIGHC OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigHC" )) -#define PROPERTYNAME_IMAGESMALL_URL OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallURL" )) -#define PROPERTYNAME_IMAGEBIG_URL OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigURL" )) -#define PROPERTYNAME_IMAGESMALLHC_URL OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallHCURL" )) -#define PROPERTYNAME_IMAGEBIGHC_URL OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigHCURL" )) - -#define IMAGES_NODENAME OUString(RTL_CONSTASCII_USTRINGPARAM("UserDefinedImages" )) -#define PRIVATE_IMAGE_URL OUString(RTL_CONSTASCII_USTRINGPARAM("private:image/" )) - -#define PROPERTYNAME_MERGEMENU_MERGEPOINT OUString(RTL_CONSTASCII_USTRINGPARAM("MergePoint" )) -#define PROPERTYNAME_MERGEMENU_MERGECOMMAND OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommand" )) -#define PROPERTYNAME_MERGEMENU_MERGECOMMANDPARAMETER OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommandParameter" )) -#define PROPERTYNAME_MERGEMENU_MERGEFALLBACK OUString(RTL_CONSTASCII_USTRINGPARAM("MergeFallback" )) -#define PROPERTYNAME_MERGEMENU_MERGECONTEXT OUString(RTL_CONSTASCII_USTRINGPARAM("MergeContext" )) -#define PROPERTYNAME_MERGEMENU_MENUITEMS OUString(RTL_CONSTASCII_USTRINGPARAM("MenuItems" )) - -#define PROPERTYNAME_MERGETOOLBAR_TOOLBAR OUString(RTL_CONSTASCII_USTRINGPARAM("MergeToolBar" )) -#define PROPERTYNAME_MERGETOOLBAR_MERGEPOINT OUString(RTL_CONSTASCII_USTRINGPARAM("MergePoint" )) -#define PROPERTYNAME_MERGETOOLBAR_MERGECOMMAND OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommand" )) -#define PROPERTYNAME_MERGETOOLBAR_MERGECOMMANDPARAMETER OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommandParameter" )) -#define PROPERTYNAME_MERGETOOLBAR_MERGEFALLBACK OUString(RTL_CONSTASCII_USTRINGPARAM("MergeFallback" )) -#define PROPERTYNAME_MERGETOOLBAR_MERGECONTEXT OUString(RTL_CONSTASCII_USTRINGPARAM("MergeContext" )) -#define PROPERTYNAME_MERGETOOLBAR_TOOLBARITEMS OUString(RTL_CONSTASCII_USTRINGPARAM("ToolBarItems" )) +#define PROPERTYNAME_IMAGESMALL OUString("ImageSmall" ) +#define PROPERTYNAME_IMAGEBIG OUString("ImageBig" ) +#define PROPERTYNAME_IMAGESMALLHC OUString("ImageSmallHC" ) +#define PROPERTYNAME_IMAGEBIGHC OUString("ImageBigHC" ) +#define PROPERTYNAME_IMAGESMALL_URL OUString("ImageSmallURL" ) +#define PROPERTYNAME_IMAGEBIG_URL OUString("ImageBigURL" ) +#define PROPERTYNAME_IMAGESMALLHC_URL OUString("ImageSmallHCURL" ) +#define PROPERTYNAME_IMAGEBIGHC_URL OUString("ImageBigHCURL" ) + +#define IMAGES_NODENAME OUString("UserDefinedImages" ) +#define PRIVATE_IMAGE_URL OUString("private:image/" ) + +#define PROPERTYNAME_MERGEMENU_MERGEPOINT OUString("MergePoint" ) +#define PROPERTYNAME_MERGEMENU_MERGECOMMAND OUString("MergeCommand" ) +#define PROPERTYNAME_MERGEMENU_MERGECOMMANDPARAMETER OUString("MergeCommandParameter" ) +#define PROPERTYNAME_MERGEMENU_MERGEFALLBACK OUString("MergeFallback" ) +#define PROPERTYNAME_MERGEMENU_MERGECONTEXT OUString("MergeContext" ) +#define PROPERTYNAME_MERGEMENU_MENUITEMS OUString("MenuItems" ) + +#define PROPERTYNAME_MERGETOOLBAR_TOOLBAR OUString("MergeToolBar" ) +#define PROPERTYNAME_MERGETOOLBAR_MERGEPOINT OUString("MergePoint" ) +#define PROPERTYNAME_MERGETOOLBAR_MERGECOMMAND OUString("MergeCommand" ) +#define PROPERTYNAME_MERGETOOLBAR_MERGECOMMANDPARAMETER OUString("MergeCommandParameter" ) +#define PROPERTYNAME_MERGETOOLBAR_MERGEFALLBACK OUString("MergeFallback" ) +#define PROPERTYNAME_MERGETOOLBAR_MERGECONTEXT OUString("MergeContext" ) +#define PROPERTYNAME_MERGETOOLBAR_TOOLBARITEMS OUString("ToolBarItems" ) // The following order is mandatory. Please add properties at the end! #define INDEX_URL 0 @@ -245,7 +245,7 @@ class AddonsOptions_Impl : public ConfigItem const Sequence< Sequence< PropertyValue > >& GetAddonsToolBarPart ( sal_uInt32 nIndex ) const ; const OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const; const Sequence< Sequence< PropertyValue > >& GetAddonsHelpMenu () const ; - Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const; + Image GetImageFromURL( const OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const; const MergeMenuInstructionContainer& GetMergeMenuInstructions() const; bool GetMergeToolbarInstructions( const OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const; @@ -299,8 +299,8 @@ class AddonsOptions_Impl : public ConfigItem sal_Bool ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& aAddonMenuSeq ); sal_Bool ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeMenuBarSeq ); - sal_Bool ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< rtl::OUString >& rAddonOfficeToolBarResNames ); - sal_Bool ReadToolBarItemSet( const rtl::OUString rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& aAddonOfficeToolBarSeq ); + sal_Bool ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames ); + sal_Bool ReadToolBarItemSet( const OUString rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& aAddonOfficeToolBarSeq ); sal_Bool ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeHelpMenuSeq ); sal_Bool ReadImages( ImageManager& aImageManager ); sal_Bool ReadMenuMergeInstructions( MergeMenuInstructionContainer& rContainer ); @@ -349,7 +349,7 @@ class AddonsOptions_Impl : public ConfigItem Sequence< Sequence< PropertyValue > > m_aCachedMenuProperties; Sequence< Sequence< PropertyValue > > m_aCachedMenuBarPartProperties; AddonToolBars m_aCachedToolBarPartProperties; - std::vector< rtl::OUString > m_aCachedToolBarPartResourceNames; + std::vector< OUString > m_aCachedToolBarPartResourceNames; Sequence< Sequence< PropertyValue > > m_aCachedHelpMenuProperties; Reference< util::XMacroExpander > m_xMacroExpander; ImageManager m_aImageManager; @@ -414,8 +414,8 @@ AddonsOptions_Impl::AddonsOptions_Impl() // Enable notification mechanism of ouer baseclass. // We need it to get information about changes outside these class on ouer used configuration keys! - Sequence< rtl::OUString > aNotifySeq( 1 ); - aNotifySeq[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AddonUI" )); + Sequence< OUString > aNotifySeq( 1 ); + aNotifySeq[0] = OUString( "AddonUI" ); EnableNotification( aNotifySeq ); } @@ -521,7 +521,7 @@ const OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nInd if ( nIndex < m_aCachedToolBarPartResourceNames.size() ) return m_aCachedToolBarPartResourceNames[nIndex]; else - return rtl::OUString(); + return OUString(); } //***************************************************************************************************************** @@ -560,7 +560,7 @@ bool AddonsOptions_Impl::GetMergeToolbarInstructions( //***************************************************************************************************************** // public method //***************************************************************************************************************** -Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const +Image AddonsOptions_Impl::GetImageFromURL( const OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const { Image aImage; @@ -582,7 +582,7 @@ Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool b sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& rAddonMenuSeq ) { // Read the AddonMenu set and fill property sequences - OUString aAddonMenuNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/AddonMenu" )); + OUString aAddonMenuNodeName( "AddonUI/AddonMenu" ); Sequence< OUString > aAddonMenuNodeSeq = GetNodeNames( aAddonMenuNodeName ); OUString aAddonMenuItemNode( aAddonMenuNodeName + m_aPathDelimiter ); @@ -621,7 +621,7 @@ sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeHelpMenuSeq ) { // Read the AddonMenu set and fill property sequences - OUString aAddonHelpMenuNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeHelp" )); + OUString aAddonHelpMenuNodeName( "AddonUI/OfficeHelp" ); Sequence< OUString > aAddonHelpMenuNodeSeq = GetNodeNames( aAddonHelpMenuNodeName ); OUString aAddonHelpMenuItemNode( aAddonHelpMenuNodeName + m_aPathDelimiter ); @@ -660,7 +660,7 @@ sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValu sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeMenuBarSeq ) { // Read the OfficeMenuBar set and fill property sequences - OUString aAddonMenuBarNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeMenuBar" )); + OUString aAddonMenuBarNodeName( "AddonUI/OfficeMenuBar" ); Sequence< OUString > aAddonMenuBarNodeSeq = GetNodeNames( aAddonMenuBarNodeName ); OUString aAddonMenuBarNode( aAddonMenuBarNodeName + m_aPathDelimiter ); @@ -713,10 +713,10 @@ sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyV //***************************************************************************************************************** // private method //***************************************************************************************************************** -sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< rtl::OUString >& rAddonOfficeToolBarResNames ) +sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames ) { // Read the OfficeToolBar set and fill property sequences - OUString aAddonToolBarNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeToolBar" )); + OUString aAddonToolBarNodeName( "AddonUI/OfficeToolBar" ); Sequence< OUString > aAddonToolBarNodeSeq = GetNodeNames( aAddonToolBarNodeName ); OUString aAddonToolBarNode( aAddonToolBarNodeName + m_aPathDelimiter ); @@ -737,7 +737,7 @@ sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeTo //***************************************************************************************************************** // private method //***************************************************************************************************************** -sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const rtl::OUString rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq ) +sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq ) { sal_Bool bInsertSeparator = sal_False; sal_uInt32 nToolBarItemCount = rAddonOfficeToolBarSeq.getLength(); @@ -808,7 +808,7 @@ void AddonsOptions_Impl::InsertToolBarSeparator( Sequence< Sequence< PropertyVal sal_Bool AddonsOptions_Impl::ReadImages( ImageManager& aImageManager ) { // Read the user-defined Images set and fill image manager - OUString aAddonImagesNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/Images" )); + OUString aAddonImagesNodeName( "AddonUI/Images" ); Sequence< OUString > aAddonImagesNodeSeq = GetNodeNames( aAddonImagesNodeName ); OUString aAddonImagesNode( aAddonImagesNodeName + m_aPathDelimiter ); @@ -878,7 +878,7 @@ OUString AddonsOptions_Impl::GeneratePrefixURL() sal_Bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer ) { - const OUString aMenuMergeRootName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeMenuBarMerging/" )); + const OUString aMenuMergeRootName( "AddonUI/OfficeMenuBarMerging/" ); Sequence< OUString > aAddonMergeNodesSeq = GetNodeNames( aMenuMergeRootName ); OUString aAddonMergeNode( aMenuMergeRootName ); @@ -964,7 +964,7 @@ sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstr //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& rCachedToolbarMergingInstructions ) { - const OUString aToolbarMergeRootName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeToolbarMerging/" )); + const OUString aToolbarMergeRootName( "AddonUI/OfficeToolbarMerging/" ); Sequence< OUString > aAddonMergeNodesSeq = GetNodeNames( aToolbarMergeRootName ); OUString aAddonMergeNode( aToolbarMergeRootName ); @@ -1695,7 +1695,7 @@ bool AddonsOptions::GetMergeToolbarInstructions( //***************************************************************************************************************** // public method //***************************************************************************************************************** -Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const +Image AddonsOptions::GetImageFromURL( const OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetImageFromURL( aURL, bBig, bNoScale ); @@ -1704,7 +1704,7 @@ Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, //***************************************************************************************************************** // public method //***************************************************************************************************************** -Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig ) const +Image AddonsOptions::GetImageFromURL( const OUString& aURL, sal_Bool bBig ) const { return GetImageFromURL( aURL, bBig, sal_False ); } diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx index e44eadd4afde..60301d9cd139 100644 --- a/framework/source/fwe/classes/bmkmenu.cxx +++ b/framework/source/fwe/classes/bmkmenu.cxx @@ -50,10 +50,10 @@ namespace framework void GetMenuEntry( Sequence< PropertyValue >& aDynamicMenuEntry, - ::rtl::OUString& rTitle, - ::rtl::OUString& rURL, - ::rtl::OUString& rFrame, - ::rtl::OUString& rImageId ); + OUString& rTitle, + OUString& rURL, + OUString& rFrame, + OUString& rImageId ); class BmkMenu_Impl { @@ -123,10 +123,10 @@ void BmkMenu::Initialize() const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); - ::rtl::OUString aTitle; - ::rtl::OUString aURL; - ::rtl::OUString aTargetFrame; - ::rtl::OUString aImageId; + OUString aTitle; + OUString aURL; + OUString aTargetFrame; + OUString aImageId; sal_uInt32 i, nCount = aDynamicMenuEntries.getLength(); for ( i = 0; i < nCount; ++i ) @@ -136,7 +136,7 @@ void BmkMenu::Initialize() if ( aTitle.isEmpty() && aURL.isEmpty() ) continue; - if ( aURL == ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:separator" ))) + if ( aURL == OUString( "private:separator" )) InsertSeparator(); else { @@ -183,10 +183,10 @@ sal_uInt16 BmkMenu::CreateMenuId() void GetMenuEntry ( Sequence< PropertyValue >& aDynamicMenuEntry, - ::rtl::OUString& rTitle, - ::rtl::OUString& rURL, - ::rtl::OUString& rFrame, - ::rtl::OUString& rImageId + OUString& rTitle, + OUString& rURL, + OUString& rFrame, + OUString& rImageId ) { for ( int i = 0; i < aDynamicMenuEntry.getLength(); i++ ) diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 8fab56fc1a10..3996d6d87374 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -47,7 +47,7 @@ static Sequence< sal_Int8 > impl_getStaticIdentifier() } -RootActionTriggerContainer::RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier ) : +RootActionTriggerContainer::RootActionTriggerContainer( const Menu* pMenu, const OUString* pMenuIdentifier ) : PropertySetContainer() , m_bContainerCreated( sal_False ) , m_bContainerChanged( sal_False ) @@ -92,7 +92,7 @@ void SAL_CALL RootActionTriggerContainer::release() throw () } // XMultiServiceFactory -Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstance( const ::rtl::OUString& aServiceSpecifier ) +Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstance( const OUString& aServiceSpecifier ) throw ( Exception, RuntimeException ) { if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGER )) @@ -102,23 +102,23 @@ throw ( Exception, RuntimeException ) else if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGERSEPARATOR )) return (OWeakObject *)( new ActionTriggerSeparatorPropertySet()); else - throw com::sun::star::uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unknown service specifier!" )), (OWeakObject *)this ); + throw com::sun::star::uno::RuntimeException( OUString( "Unknown service specifier!" ), (OWeakObject *)this ); } -Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) +Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) throw ( Exception, RuntimeException ) { return createInstance( ServiceSpecifier ); } -Sequence< ::rtl::OUString > SAL_CALL RootActionTriggerContainer::getAvailableServiceNames() +Sequence< OUString > SAL_CALL RootActionTriggerContainer::getAvailableServiceNames() throw ( RuntimeException ) { - Sequence< ::rtl::OUString > aSeq( 3 ); + Sequence< OUString > aSeq( 3 ); - aSeq[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGER )); - aSeq[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERCONTAINER )); - aSeq[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERSEPARATOR )); + aSeq[0] = OUString( SERVICENAME_ACTIONTRIGGER ); + aSeq[1] = OUString( SERVICENAME_ACTIONTRIGGERCONTAINER ); + aSeq[2] = OUString( SERVICENAME_ACTIONTRIGGERSEPARATOR ); return aSeq; } @@ -222,13 +222,13 @@ throw (::com::sun::star::uno::RuntimeException) // XServiceInfo -::rtl::OUString SAL_CALL RootActionTriggerContainer::getImplementationName() +OUString SAL_CALL RootActionTriggerContainer::getImplementationName() throw ( RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER )); + return OUString( IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER ); } -sal_Bool SAL_CALL RootActionTriggerContainer::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL RootActionTriggerContainer::supportsService( const OUString& ServiceName ) throw ( RuntimeException ) { if ( ServiceName.equalsAscii( SERVICENAME_ACTIONTRIGGERCONTAINER )) @@ -237,12 +237,12 @@ throw ( RuntimeException ) return sal_False; } -Sequence< ::rtl::OUString > SAL_CALL RootActionTriggerContainer::getSupportedServiceNames() +Sequence< OUString > SAL_CALL RootActionTriggerContainer::getSupportedServiceNames() throw ( RuntimeException ) { - Sequence< ::rtl::OUString > seqServiceNames( 1 ); + Sequence< OUString > seqServiceNames( 1 ); - seqServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERCONTAINER )); + seqServiceNames[0] = OUString( SERVICENAME_ACTIONTRIGGERCONTAINER ); return seqServiceNames; } @@ -327,15 +327,15 @@ void RootActionTriggerContainer::FillContainer() m_pMenu ); m_bInContainerCreation = sal_False; } -::rtl::OUString RootActionTriggerContainer::getName() throw ( RuntimeException ) +OUString RootActionTriggerContainer::getName() throw ( RuntimeException ) { - ::rtl::OUString sRet; + OUString sRet; if( m_pMenuIdentifier ) sRet = *m_pMenuIdentifier; return sRet; } -void RootActionTriggerContainer::setName( const ::rtl::OUString& ) throw ( RuntimeException) +void RootActionTriggerContainer::setName( const OUString& ) throw ( RuntimeException) { throw RuntimeException(); } diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index 7a258345322b..cb57da289c85 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -54,7 +54,7 @@ sal_Bool IsSeparator( Reference< XPropertySet > xPropertySet ) Reference< XServiceInfo > xServiceInfo( xPropertySet, UNO_QUERY ); try { - return xServiceInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERSEPARATOR )) ); + return xServiceInfo->supportsService( OUString( SERVICENAME_ACTIONTRIGGERSEPARATOR ) ); } catch (const Exception&) { @@ -75,13 +75,13 @@ void GetMenuItemAttributes( Reference< XPropertySet > xActionTriggerPropertySet, try { // mandatory properties - a = xActionTriggerPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )) ); + a = xActionTriggerPropertySet->getPropertyValue( OUString( "Text" ) ); a >>= aMenuLabel; - a = xActionTriggerPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" )) ); + a = xActionTriggerPropertySet->getPropertyValue( OUString( "CommandURL" ) ); a >>= aCommandURL; - a = xActionTriggerPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Image" )) ); + a = xActionTriggerPropertySet->getPropertyValue( OUString( "Image" ) ); a >>= xBitmap; - a = xActionTriggerPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "SubContainer" )) ); + a = xActionTriggerPropertySet->getPropertyValue( OUString( "SubContainer" ) ); a >>= xSubContainer; } catch (const Exception&) @@ -91,7 +91,7 @@ void GetMenuItemAttributes( Reference< XPropertySet > xActionTriggerPropertySet, // optional properties try { - a = xActionTriggerPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" )) ); + a = xActionTriggerPropertySet->getPropertyValue( OUString( "HelpURL" ) ); a >>= aHelpURL; } catch (const Exception&) @@ -105,7 +105,7 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, Reference< XIndexC if ( xIndexAccess.is() ) { AddonsOptions aAddonOptions; - OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + OUString aSlotURL( "slot:" ); for ( sal_Int32 i = 0; i < xIndexAccess->getCount(); i++ ) { @@ -252,7 +252,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p if ( xMultiServiceFactory.is() ) { xPropSet = Reference< XPropertySet >( xMultiServiceFactory->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ActionTrigger" )) ), + OUString( "com.sun.star.ui.ActionTrigger" ) ), UNO_QUERY ); Any a; @@ -262,18 +262,18 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p // Retrieve the menu attributes and set them in our PropertySet OUString aLabel = pMenu->GetItemText( nItemId ); a <<= aLabel; - xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )), a ); + xPropSet->setPropertyValue( OUString( "Text" ), a ); OUString aCommandURL = pMenu->GetItemCommand( nItemId ); if ( aCommandURL.isEmpty() ) { - aCommandURL = OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); + aCommandURL = OUString( "slot:" ); aCommandURL += OUString::valueOf( (sal_Int32)nItemId ); } a <<= aCommandURL; - xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" )), a ); + xPropSet->setPropertyValue( OUString( "CommandURL" ), a ); Image aImage = pMenu->GetItemImage( nItemId ); if ( !!aImage ) @@ -281,7 +281,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p // We use our own optimized XBitmap implementation Reference< XBitmap > xBitmap( static_cast< cppu::OWeakObject* >( new ImageWrapper( aImage )), UNO_QUERY ); a <<= xBitmap; - xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Image" )), a ); + xPropSet->setPropertyValue( OUString( "Image" ), a ); } } catch (const Exception&) @@ -298,7 +298,7 @@ Reference< XPropertySet > CreateActionTriggerSeparator( const Reference< XIndexC if ( xMultiServiceFactory.is() ) { return Reference< XPropertySet >( xMultiServiceFactory->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ActionTriggerSeparator" )) ), + OUString( "com.sun.star.ui.ActionTriggerSeparator" ) ), UNO_QUERY ); } @@ -311,7 +311,7 @@ Reference< XIndexContainer > CreateActionTriggerContainer( const Reference< XInd if ( xMultiServiceFactory.is() ) { return Reference< XIndexContainer >( xMultiServiceFactory->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ActionTriggerContainer" )) ), + OUString( "com.sun.star.ui.ActionTriggerContainer" ) ), UNO_QUERY ); } @@ -353,7 +353,7 @@ void FillActionTriggerContainerWithMenu( const Menu* pMenu, Reference< XIndexCon Reference< XIndexContainer > xSubContainer = CreateActionTriggerContainer( rActionTriggerContainer ); a <<= xSubContainer; - xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "SubContainer" )), a ); + xPropSet->setPropertyValue( OUString( "SubContainer" ), a ); FillActionTriggerContainerWithMenu( pPopupMenu, xSubContainer ); } } @@ -383,7 +383,7 @@ void ActionTriggerHelper::FillActionTriggerContainerFromMenu( Reference< XIndexContainer > ActionTriggerHelper::CreateActionTriggerContainerFromMenu( const Menu* pMenu, - const ::rtl::OUString* pMenuIdentifier ) + const OUString* pMenuIdentifier ) { return new RootActionTriggerContainer( pMenu, pMenuIdentifier ); } diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx index 48357b16caf1..70d9d28bda66 100644 --- a/framework/source/fwe/helper/propertysetcontainer.cxx +++ b/framework/source/fwe/helper/propertysetcontainer.cxx @@ -102,7 +102,7 @@ void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com: else { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM( WRONG_TYPE_EXCEPTION )), + OUString( WRONG_TYPE_EXCEPTION ), (OWeakObject *)this, 2 ); } } @@ -140,7 +140,7 @@ void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const ::com else { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM( WRONG_TYPE_EXCEPTION )), + OUString( WRONG_TYPE_EXCEPTION ), (OWeakObject *)this, 2 ); } } diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index ec2ae43c84ca..407d5f267056 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -91,7 +91,7 @@ void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xO } //----------------------------------------------- -::rtl::OUString SAL_CALL TitleHelper::getTitle() +OUString SAL_CALL TitleHelper::getTitle() throw (css::uno::RuntimeException) { // SYNCHRONIZED -> @@ -127,7 +127,7 @@ void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::fr } //----------------------------------------------- -void SAL_CALL TitleHelper::setTitle(const ::rtl::OUString& sTitle) +void SAL_CALL TitleHelper::setTitle(const OUString& sTitle) throw (css::uno::RuntimeException) { // SYNCHRONIZED -> @@ -261,7 +261,7 @@ void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent) // SYNCHRONIZED -> aLock.reset (); - m_sTitle = ::rtl::OUString (); + m_sTitle = OUString (); m_nLeasedNumber = css::frame::UntitledNumbersConst::INVALID_NUMBER; aLock.clear (); @@ -351,8 +351,8 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram ) return; - ::rtl::OUString sTitle; - ::rtl::OUString sURL ; + OUString sTitle; + OUString sURL ; css::uno::Reference< css::frame::XStorable > xURLProvider(xModel , css::uno::UNO_QUERY); if (xURLProvider.is()) @@ -370,7 +370,7 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram if (nLeasedNumber == css::frame::UntitledNumbersConst::INVALID_NUMBER) nLeasedNumber = xNumbers->leaseNumber (xOwner); - ::rtl::OUStringBuffer sNewTitle(256); + OUStringBuffer sNewTitle(256); sNewTitle.append (xNumbers->getUntitledPrefix ()); if (nLeasedNumber != css::frame::UntitledNumbersConst::INVALID_NUMBER) sNewTitle.append ((::sal_Int32)nLeasedNumber); @@ -422,7 +422,7 @@ void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css: ) return; - ::rtl::OUStringBuffer sTitle(256); + OUStringBuffer sTitle(256); if (nLeasedNumber == css::frame::UntitledNumbersConst::INVALID_NUMBER) nLeasedNumber = xNumbers->leaseNumber (xOwner); @@ -451,7 +451,7 @@ void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css: // SYNCHRONIZED -> aLock.reset (); - ::rtl::OUString sNewTitle = sTitle.makeStringAndClear (); + OUString sNewTitle = sTitle.makeStringAndClear (); sal_Bool bChanged = !init && m_sTitle != sNewTitle; m_sTitle = sNewTitle; m_nLeasedNumber = nLeasedNumber; @@ -485,7 +485,7 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram if ( ! xComponent.is ()) xComponent = xFrame->getComponentWindow (); - ::rtl::OUStringBuffer sTitle (256); + OUStringBuffer sTitle (256); impl_appendComponentTitle (sTitle, xComponent); impl_appendProductName (sTitle); @@ -495,7 +495,7 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram // SYNCHRONIZED -> aLock.reset (); - ::rtl::OUString sNewTitle = sTitle.makeStringAndClear (); + OUString sNewTitle = sTitle.makeStringAndClear (); sal_Bool bChanged = !init && m_sTitle != sNewTitle; m_sTitle = sNewTitle; @@ -507,7 +507,7 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram } //***************************************************************************************************************** -void TitleHelper::impl_appendComponentTitle ( ::rtl::OUStringBuffer& sTitle , +void TitleHelper::impl_appendComponentTitle ( OUStringBuffer& sTitle , const css::uno::Reference< css::uno::XInterface >& xComponent) { css::uno::Reference< css::frame::XTitle > xTitle(xComponent, css::uno::UNO_QUERY); @@ -518,9 +518,9 @@ void TitleHelper::impl_appendComponentTitle ( ::rtl::OUStringBuffer& } //***************************************************************************************************************** -void TitleHelper::impl_appendProductName (::rtl::OUStringBuffer& sTitle) +void TitleHelper::impl_appendProductName (OUStringBuffer& sTitle) { - rtl::OUString name(utl::ConfigManager::getProductName()); + OUString name(utl::ConfigManager::getProductName()); if (!name.isEmpty()) { if (sTitle.getLength() != 0) @@ -530,7 +530,7 @@ void TitleHelper::impl_appendProductName (::rtl::OUStringBuffer& sTitle) } //***************************************************************************************************************** -void TitleHelper::impl_appendModuleName (::rtl::OUStringBuffer& sTitle) +void TitleHelper::impl_appendModuleName (OUStringBuffer& sTitle) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -546,9 +546,9 @@ void TitleHelper::impl_appendModuleName (::rtl::OUStringBuffer& sTitle) css::uno::Reference< css::frame::XModuleManager2 > xModuleManager = css::frame::ModuleManager::create(xContext); - const ::rtl::OUString sID = xModuleManager->identify(xOwner); + const OUString sID = xModuleManager->identify(xOwner); ::comphelper::SequenceAsHashMap lProps = xModuleManager->getByName (sID); - const ::rtl::OUString sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_UINAME, ::rtl::OUString()); + const OUString sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_UINAME, OUString()); // An UIname property is an optional value ! // So please add it to the title in case it does realy exists only. @@ -564,19 +564,19 @@ void TitleHelper::impl_appendModuleName (::rtl::OUStringBuffer& sTitle) //***************************************************************************************************************** #ifdef DBG_UTIL -void TitleHelper::impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle) +void TitleHelper::impl_appendDebugVersion (OUStringBuffer& sTitle) { - rtl::OUString version(utl::ConfigManager::getProductVersion()); + OUString version(utl::ConfigManager::getProductVersion()); sTitle.append(' '); sTitle.append(version); - ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("development")); - ::rtl::OUString sVersion = ::utl::Bootstrap::getBuildIdData(sDefault); + OUString sDefault("development"); + OUString sVersion = ::utl::Bootstrap::getBuildIdData(sDefault); sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM(" [")); sTitle.append(sVersion); sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM("]")); } #else -void TitleHelper::impl_appendDebugVersion (::rtl::OUStringBuffer&) +void TitleHelper::impl_appendDebugVersion (OUStringBuffer&) { } #endif @@ -640,10 +640,10 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl } //----------------------------------------------- -::rtl::OUString TitleHelper::impl_convertURL2Title(const ::rtl::OUString& sURL) +OUString TitleHelper::impl_convertURL2Title(const OUString& sURL) { INetURLObject aURL (sURL); - ::rtl::OUString sTitle; + OUString sTitle; if (aURL.GetProtocol() == INET_PROT_FILE) { diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 3ad92eb73239..ec571ebfdd83 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -78,7 +78,7 @@ namespace framework ); virtual ~UndoActionWrapper(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; virtual void Undo(); virtual void Redo(); virtual sal_Bool CanRepeat(SfxRepeatTarget&) const; @@ -111,9 +111,9 @@ namespace framework } //------------------------------------------------------------------------------------------------------------------ - rtl::OUString UndoActionWrapper::GetComment() const + OUString UndoActionWrapper::GetComment() const { - rtl::OUString sComment; + OUString sComment; try { sComment = m_xUndoAction->getTitle(); @@ -180,7 +180,7 @@ namespace framework void cancel( const Reference< XInterface >& i_context ) { m_caughtException <<= RuntimeException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Concurrency error: an ealier operation on the stack failed." ) ), + OUString( "Concurrency error: an ealier operation on the stack failed." ), i_context ); m_finishCondition.set(); @@ -271,7 +271,7 @@ namespace framework // public operations void disposing(); - void enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden, IMutexGuard& i_instanceLock ); + void enterUndoContext( const OUString& i_title, const bool i_hidden, IMutexGuard& i_instanceLock ); void leaveUndoContext( IMutexGuard& i_instanceLock ); void addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock ); void undo( IMutexGuard& i_instanceLock ); @@ -304,15 +304,15 @@ namespace framework } UndoManagerEvent - buildEvent( ::rtl::OUString const& i_title ) const; + buildEvent( OUString const& i_title ) const; void impl_notifyModified(); - void notify( ::rtl::OUString const& i_title, + void notify( OUString const& i_title, void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ) ); void notify( void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ) ) { - notify( ::rtl::OUString(), i_notificationMethod ); + notify( OUString(), i_notificationMethod ); } void notify( void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const EventObject& ) ); @@ -322,7 +322,7 @@ namespace framework void impl_processRequest( ::boost::function0< void > const& i_request, IMutexGuard& i_instanceLock ); /// impl-versions of the XUndoManager API. - void impl_enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden ); + void impl_enterUndoContext( const OUString& i_title, const bool i_hidden ); void impl_leaveUndoContext(); void impl_addUndoAction( const Reference< XUndoAction >& i_action ); void impl_doUndoRedo( IMutexGuard& i_externalLock, const bool i_undo ); @@ -347,7 +347,7 @@ namespace framework } //------------------------------------------------------------------------------------------------------------------ - UndoManagerEvent UndoManagerHelper_Impl::buildEvent( ::rtl::OUString const& i_title ) const + UndoManagerEvent UndoManagerHelper_Impl::buildEvent( OUString const& i_title ) const { UndoManagerEvent aEvent; aEvent.Source = getXUndoManager(); @@ -364,7 +364,7 @@ namespace framework } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper_Impl::notify( ::rtl::OUString const& i_title, + void UndoManagerHelper_Impl::notify( OUString const& i_title, void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ) ) { const UndoManagerEvent aEvent( buildEvent( i_title ) ); @@ -391,7 +391,7 @@ namespace framework } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper_Impl::enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden, IMutexGuard& i_instanceLock ) + void UndoManagerHelper_Impl::enterUndoContext( const OUString& i_title, const bool i_hidden, IMutexGuard& i_instanceLock ) { impl_processRequest( ::boost::bind( @@ -421,7 +421,7 @@ namespace framework { if ( !i_action.is() ) throw IllegalArgumentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal undo action object" ) ), + OUString( "illegal undo action object" ), getXUndoManager(), 1 ); @@ -566,7 +566,7 @@ namespace framework } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper_Impl::impl_enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden ) + void UndoManagerHelper_Impl::impl_enterUndoContext( const OUString& i_title, const bool i_hidden ) { // SYNCHRONIZED ---> ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -578,13 +578,13 @@ namespace framework if ( i_hidden && ( rUndoManager.GetUndoActionCount( IUndoManager::CurrentLevel ) == 0 ) ) throw EmptyUndoStackException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "can't enter a hidden context without a previous Undo action" ) ), + OUString( "can't enter a hidden context without a previous Undo action" ), m_rUndoManagerImplementation.getThis() ); { ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning ); - rUndoManager.EnterListAction( i_title, ::rtl::OUString() ); + rUndoManager.EnterListAction( i_title, OUString() ); } m_aContextVisibilities.push( i_hidden ); @@ -610,7 +610,7 @@ namespace framework if ( !rUndoManager.IsInListAction() ) throw InvalidStateException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no active undo context" ) ), + OUString( "no active undo context" ), getXUndoManager() ); @@ -632,7 +632,7 @@ namespace framework // prepare notification void ( SAL_CALL XUndoManagerListener::*notificationMethod )( const UndoManagerEvent& ) = NULL; - UndoManagerEvent aContextEvent( buildEvent( ::rtl::OUString() ) ); + UndoManagerEvent aContextEvent( buildEvent( OUString() ) ); const EventObject aClearedEvent( getXUndoManager() ); if ( nContextElements == 0 ) { @@ -669,13 +669,13 @@ namespace framework IUndoManager& rUndoManager = getUndoManager(); if ( rUndoManager.IsInListAction() ) - throw UndoContextNotClosedException( ::rtl::OUString(), getXUndoManager() ); + throw UndoContextNotClosedException( OUString(), getXUndoManager() ); const size_t nElements = i_undo ? rUndoManager.GetUndoActionCount( IUndoManager::TopLevel ) : rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ); if ( nElements == 0 ) - throw EmptyUndoStackException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stack is empty" )), getXUndoManager() ); + throw EmptyUndoStackException( OUString( "stack is empty" ), getXUndoManager() ); aGuard.clear(); // <--- SYNCHRONIZED @@ -693,7 +693,7 @@ namespace framework { // not allowed to leave const Any aError( ::cppu::getCaughtException() ); - throw UndoFailedException( ::rtl::OUString(), getXUndoManager(), aError ); + throw UndoFailedException( OUString(), getXUndoManager(), aError ); } // note that in opposite to all of the other methods, we do *not* have our mutex locked when calling @@ -743,7 +743,7 @@ namespace framework IUndoManager& rUndoManager = getUndoManager(); if ( rUndoManager.IsInListAction() ) - throw UndoContextNotClosedException( ::rtl::OUString(), getXUndoManager() ); + throw UndoContextNotClosedException( OUString(), getXUndoManager() ); { ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning ); @@ -766,7 +766,7 @@ namespace framework IUndoManager& rUndoManager = getUndoManager(); if ( rUndoManager.IsInListAction() ) - throw UndoContextNotClosedException( ::rtl::OUString(), getXUndoManager() ); + throw UndoContextNotClosedException( OUString(), getXUndoManager() ); { ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning ); @@ -944,7 +944,7 @@ namespace framework } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper::enterUndoContext( const ::rtl::OUString& i_title, IMutexGuard& i_instanceLock ) + void UndoManagerHelper::enterUndoContext( const OUString& i_title, IMutexGuard& i_instanceLock ) { m_pImpl->enterUndoContext( i_title, false, i_instanceLock ); } @@ -952,7 +952,7 @@ namespace framework //------------------------------------------------------------------------------------------------------------------ void UndoManagerHelper::enterHiddenUndoContext( IMutexGuard& i_instanceLock ) { - m_pImpl->enterUndoContext( ::rtl::OUString(), true, i_instanceLock ); + m_pImpl->enterUndoContext( OUString(), true, i_instanceLock ); } //------------------------------------------------------------------------------------------------------------------ @@ -1035,7 +1035,7 @@ namespace framework namespace { //.............................................................................................................. - ::rtl::OUString lcl_getCurrentActionTitle( UndoManagerHelper_Impl& i_impl, const bool i_undo ) + OUString lcl_getCurrentActionTitle( UndoManagerHelper_Impl& i_impl, const bool i_undo ) { // SYNCHRONIZED ---> ::osl::MutexGuard aGuard( i_impl.getMutex() ); @@ -1046,8 +1046,8 @@ namespace framework : rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ); if ( nActionCount == 0 ) throw EmptyUndoStackException( - i_undo ? ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no action on the undo stack" ) ) - : ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no action on the redo stack" ) ), + i_undo ? OUString( "no action on the undo stack" ) + : OUString( "no action on the redo stack" ), i_impl.getXUndoManager() ); return i_undo @@ -1057,7 +1057,7 @@ namespace framework } //.............................................................................................................. - Sequence< ::rtl::OUString > lcl_getAllActionTitles( UndoManagerHelper_Impl& i_impl, const bool i_undo ) + Sequence< OUString > lcl_getAllActionTitles( UndoManagerHelper_Impl& i_impl, const bool i_undo ) { // SYNCHRONIZED ---> ::osl::MutexGuard aGuard( i_impl.getMutex() ); @@ -1067,7 +1067,7 @@ namespace framework ? rUndoManager.GetUndoActionCount( IUndoManager::TopLevel ) : rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ); - Sequence< ::rtl::OUString > aTitles( nCount ); + Sequence< OUString > aTitles( nCount ); for ( size_t i=0; i<nCount; ++i ) { aTitles[i] = i_undo @@ -1080,25 +1080,25 @@ namespace framework } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString UndoManagerHelper::getCurrentUndoActionTitle() const + OUString UndoManagerHelper::getCurrentUndoActionTitle() const { return lcl_getCurrentActionTitle( *m_pImpl, true ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString UndoManagerHelper::getCurrentRedoActionTitle() const + OUString UndoManagerHelper::getCurrentRedoActionTitle() const { return lcl_getCurrentActionTitle( *m_pImpl, false ); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > UndoManagerHelper::getAllUndoActionTitles() const + Sequence< OUString > UndoManagerHelper::getAllUndoActionTitles() const { return lcl_getAllActionTitles( *m_pImpl, true ); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > UndoManagerHelper::getAllRedoActionTitles() const + Sequence< OUString > UndoManagerHelper::getAllRedoActionTitles() const { return lcl_getAllActionTitles( *m_pImpl, false ); } diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 9e498de9e6cb..b9653dd176b1 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -116,9 +116,9 @@ MenuStyleItem MenuItemStyles[ ] = { sal_Int32 nMenuStyleItemEntries = (sizeof (MenuItemStyles) / sizeof (MenuItemStyles[0])); static void ExtractMenuParameters( const Sequence< PropertyValue > rProp, - ::rtl::OUString& rCommandURL, - ::rtl::OUString& rLabel, - ::rtl::OUString& rHelpURL, + OUString& rCommandURL, + OUString& rLabel, + OUString& rHelpURL, Reference< XIndexAccess >& rSubMenu, sal_Int16& rType, sal_Int16& rStyle ) @@ -160,12 +160,12 @@ static void ExtractMenuParameters( const Sequence< PropertyValue > rProp, ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() : m_xLocator( 0 ), m_xReader( 0 ), - m_aType( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE )), - m_aLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL )), - m_aContainer( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER )), - m_aHelpURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL )), - m_aCommandURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL )), - m_aStyle( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_STYLE )) + m_aType( ITEM_DESCRIPTOR_TYPE ), + m_aLabel( ITEM_DESCRIPTOR_LABEL ), + m_aContainer( ITEM_DESCRIPTOR_CONTAINER ), + m_aHelpURL( ITEM_DESCRIPTOR_HELPURL ), + m_aCommandURL( ITEM_DESCRIPTOR_COMMANDURL ), + m_aStyle( ITEM_DESCRIPTOR_STYLE ) { } @@ -174,13 +174,13 @@ ReadMenuDocumentHandlerBase::~ReadMenuDocumentHandlerBase() } void SAL_CALL ReadMenuDocumentHandlerBase::ignorableWhitespace( - const ::rtl::OUString& ) + const OUString& ) throw( SAXException, RuntimeException ) { } void SAL_CALL ReadMenuDocumentHandlerBase::processingInstruction( - const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) + const OUString& /*aTarget*/, const OUString& /*aData*/ ) throw( SAXException, RuntimeException ) { } @@ -192,22 +192,22 @@ throw( SAXException, RuntimeException ) m_xLocator = xLocator; } -::rtl::OUString ReadMenuDocumentHandlerBase::getErrorLineString() +OUString ReadMenuDocumentHandlerBase::getErrorLineString() { char buffer[32]; if ( m_xLocator.is() ) { snprintf( buffer, sizeof(buffer), "Line: %ld - ", static_cast<long>( m_xLocator->getLineNumber() )); - return ::rtl::OUString::createFromAscii( buffer ); + return OUString::createFromAscii( buffer ); } else - return ::rtl::OUString(); + return OUString(); } void ReadMenuDocumentHandlerBase::initPropertyCommon( - Sequence< PropertyValue > &rProps, const rtl::OUString &rCommandURL, - const rtl::OUString &rHelpId, const rtl::OUString &rLabel, sal_Int16 nItemStyleBits ) + Sequence< PropertyValue > &rProps, const OUString &rCommandURL, + const OUString &rHelpId, const OUString &rLabel, sal_Int16 nItemStyleBits ) { rProps[0].Name = m_aCommandURL; rProps[1].Name = m_aHelpURL; @@ -252,15 +252,15 @@ void SAL_CALL OReadMenuDocumentHandler::endDocument(void) { if ( m_nElementDepth > 0 ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "A closing element is missing!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "A closing element is missing!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } void SAL_CALL OReadMenuDocumentHandler::startElement( - const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttrList ) + const OUString& aName, const Reference< XAttributeList > &xAttrList ) throw( SAXException, RuntimeException ) { if ( m_bMenuBarMode ) @@ -279,13 +279,13 @@ throw( SAXException, RuntimeException ) } -void SAL_CALL OReadMenuDocumentHandler::characters(const rtl::OUString&) +void SAL_CALL OReadMenuDocumentHandler::characters(const OUString&) throw( SAXException, RuntimeException ) { } -void SAL_CALL OReadMenuDocumentHandler::endElement( const ::rtl::OUString& aName ) +void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) throw( SAXException, RuntimeException ) { if ( m_bMenuBarMode ) @@ -299,8 +299,8 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const ::rtl::OUString& aName m_bMenuBarMode = sal_False; if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUBAR ))) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menubar expected!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "closing element menubar expected!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -339,7 +339,7 @@ void SAL_CALL OReadMenuBarHandler::endDocument(void) void SAL_CALL OReadMenuBarHandler::startElement( - const ::rtl::OUString& rName, const Reference< XAttributeList > &xAttrList ) + const OUString& rName, const Reference< XAttributeList > &xAttrList ) throw( SAXException, RuntimeException ) { if ( m_bMenuMode ) @@ -351,9 +351,9 @@ throw( SAXException, RuntimeException ) { ++m_nElementDepth; - ::rtl::OUString aHelpId; - ::rtl::OUString aCommandId; - ::rtl::OUString aLabel; + OUString aHelpId; + OUString aCommandId; + OUString aLabel; sal_Int16 nItemBits(0); m_bMenuMode = sal_True; @@ -371,8 +371,8 @@ throw( SAXException, RuntimeException ) // read attributes for menu for ( sal_Int16 i=0; i< xAttrList->getLength(); i++ ) { - ::rtl::OUString aName = xAttrList->getNameByIndex( i ); - ::rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString aName = xAttrList->getNameByIndex( i ); + OUString aValue = xAttrList->getValueByIndex( i ); if ( aName == ATTRIBUTE_ID ) aCommandId = aValue; else if ( aName == ATTRIBUTE_LABEL ) @@ -381,11 +381,11 @@ throw( SAXException, RuntimeException ) aHelpId = aValue; else if ( aName == ATTRIBUTE_STYLE ) { - ::rtl::OUString aTemp( aValue ); + OUString aTemp( aValue ); sal_Int32 nIndex = 0; do { - ::rtl::OUString aToken = aTemp.getToken( 0, '+', nIndex ); + OUString aToken = aTemp.getToken( 0, '+', nIndex ); if ( !aToken.isEmpty() ) { if ( aToken == ATTRIBUTE_ITEMSTYLE_TEXT ) @@ -410,8 +410,8 @@ throw( SAXException, RuntimeException ) } else { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "attribute id for element menu required!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "attribute id for element menu required!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -421,20 +421,20 @@ throw( SAXException, RuntimeException ) } else { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "element menu expected!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "element menu expected!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } -void SAL_CALL OReadMenuBarHandler::characters(const rtl::OUString&) +void SAL_CALL OReadMenuBarHandler::characters(const OUString&) throw( SAXException, RuntimeException ) { } -void OReadMenuBarHandler::endElement( const ::rtl::OUString& aName ) +void OReadMenuBarHandler::endElement( const OUString& aName ) throw( SAXException, RuntimeException ) { if ( m_bMenuMode ) @@ -447,8 +447,8 @@ void OReadMenuBarHandler::endElement( const ::rtl::OUString& aName ) m_bMenuMode = sal_False; if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU ))) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menu expected!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "closing element menu expected!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -490,7 +490,7 @@ void SAL_CALL OReadMenuHandler::endDocument(void) void SAL_CALL OReadMenuHandler::startElement( - const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttrList ) + const OUString& aName, const Reference< XAttributeList > &xAttrList ) throw( SAXException, RuntimeException ) { if ( m_bMenuPopupMode ) @@ -507,20 +507,20 @@ throw( SAXException, RuntimeException ) } else { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown element found!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "unknown element found!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } -void SAL_CALL OReadMenuHandler::characters(const rtl::OUString&) +void SAL_CALL OReadMenuHandler::characters(const OUString&) throw( SAXException, RuntimeException ) { } -void SAL_CALL OReadMenuHandler::endElement( const ::rtl::OUString& aName ) +void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) throw( SAXException, RuntimeException ) { if ( m_bMenuPopupMode ) @@ -533,8 +533,8 @@ void SAL_CALL OReadMenuHandler::endElement( const ::rtl::OUString& aName ) m_bMenuPopupMode = sal_False; if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUPOPUP ))) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menupopup expected!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "closing element menupopup expected!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -577,7 +577,7 @@ void SAL_CALL OReadMenuPopupHandler::endDocument(void) } void SAL_CALL OReadMenuPopupHandler::startElement( - const ::rtl::OUString& rName, const Reference< XAttributeList > &xAttrList ) + const OUString& rName, const Reference< XAttributeList > &xAttrList ) throw( SAXException, RuntimeException ) { ++m_nElementDepth; @@ -586,9 +586,9 @@ throw( SAXException, RuntimeException ) m_xReader->startElement( rName, xAttrList ); else if ( rName == ELEMENT_MENU ) { - ::rtl::OUString aHelpId; - ::rtl::OUString aCommandId; - ::rtl::OUString aLabel; + OUString aHelpId; + OUString aCommandId; + OUString aLabel; sal_Int16 nItemBits(0); m_bMenuMode = sal_True; @@ -601,8 +601,8 @@ throw( SAXException, RuntimeException ) // read attributes for menu for ( sal_Int16 i=0; i< xAttrList->getLength(); i++ ) { - ::rtl::OUString aName = xAttrList->getNameByIndex( i ); - ::rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString aName = xAttrList->getNameByIndex( i ); + OUString aValue = xAttrList->getValueByIndex( i ); if ( aName == ATTRIBUTE_ID ) aCommandId = aValue; else if ( aName == ATTRIBUTE_LABEL ) @@ -611,11 +611,11 @@ throw( SAXException, RuntimeException ) aHelpId = aValue; else if ( aName == ATTRIBUTE_STYLE ) { - ::rtl::OUString aTemp( aValue ); + OUString aTemp( aValue ); sal_Int32 nIndex = 0; do { - ::rtl::OUString aToken = aTemp.getToken( 0, '+', nIndex ); + OUString aToken = aTemp.getToken( 0, '+', nIndex ); if ( !aToken.isEmpty() ) { if ( aToken == ATTRIBUTE_ITEMSTYLE_TEXT ) @@ -641,8 +641,8 @@ throw( SAXException, RuntimeException ) } else { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "attribute id for element menu required!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "attribute id for element menu required!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -651,15 +651,15 @@ throw( SAXException, RuntimeException ) } else if ( rName == ELEMENT_MENUITEM ) { - ::rtl::OUString aHelpId; - ::rtl::OUString aCommandId; - ::rtl::OUString aLabel; + OUString aHelpId; + OUString aCommandId; + OUString aLabel; sal_Int16 nItemBits(0); // read attributes for menu item for ( sal_Int16 i=0; i< xAttrList->getLength(); i++ ) { - ::rtl::OUString aName = xAttrList->getNameByIndex( i ); - ::rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString aName = xAttrList->getNameByIndex( i ); + OUString aValue = xAttrList->getValueByIndex( i ); if ( aName == ATTRIBUTE_ID ) aCommandId = aValue; else if ( aName == ATTRIBUTE_LABEL ) @@ -668,11 +668,11 @@ throw( SAXException, RuntimeException ) aHelpId = aValue; else if ( aName == ATTRIBUTE_STYLE ) { - ::rtl::OUString aTemp( aValue ); + OUString aTemp( aValue ); sal_Int32 nIndex = 0; do { - ::rtl::OUString aToken = aTemp.getToken( 0, '+', nIndex ); + OUString aToken = aTemp.getToken( 0, '+', nIndex ); if ( !aToken.isEmpty() ) { if ( aToken == ATTRIBUTE_ITEMSTYLE_TEXT ) @@ -702,7 +702,7 @@ throw( SAXException, RuntimeException ) else if ( rName == ELEMENT_MENUSEPARATOR ) { Sequence< PropertyValue > aMenuSeparator( 1 ); - aMenuSeparator[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE )); + aMenuSeparator[0].Name = OUString( ITEM_DESCRIPTOR_TYPE ); aMenuSeparator[0].Value <<= ::com::sun::star::ui::ItemType::SEPARATOR_LINE; m_xMenuContainer->insertByIndex( m_xMenuContainer->getCount(), makeAny( aMenuSeparator ) ); @@ -711,20 +711,20 @@ throw( SAXException, RuntimeException ) } else { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown element found!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "unknown element found!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } -void SAL_CALL OReadMenuPopupHandler::characters(const rtl::OUString&) +void SAL_CALL OReadMenuPopupHandler::characters(const OUString&) throw( SAXException, RuntimeException ) { } -void SAL_CALL OReadMenuPopupHandler::endElement( const ::rtl::OUString& aName ) +void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) throw( SAXException, RuntimeException ) { --m_nElementDepth; @@ -737,8 +737,8 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const ::rtl::OUString& aName ) m_bMenuMode = sal_False; if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU ))) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menu expected!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "closing element menu expected!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -751,8 +751,8 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const ::rtl::OUString& aName ) { if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUITEM ))) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menuitem expected!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "closing element menuitem expected!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -760,8 +760,8 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const ::rtl::OUString& aName ) { if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUSEPARATOR ))) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menuseparator expected!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "closing element menuseparator expected!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -782,7 +782,7 @@ OWriteMenuDocumentHandler::OWriteMenuDocumentHandler( { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); - m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); + m_aAttributeType = OUString( ATTRIBUTE_TYPE_CDATA ); } @@ -803,26 +803,26 @@ throw ( SAXException, RuntimeException ) Reference< XExtendedDocumentHandler > xExtendedDocHandler( m_xWriteDocumentHandler, UNO_QUERY ); if ( xExtendedDocHandler.is() ) { - xExtendedDocHandler->unknown( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MENUBAR_DOCTYPE )) ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + xExtendedDocHandler->unknown( OUString( MENUBAR_DOCTYPE ) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); } - pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_MENU )), + pList->AddAttribute( OUString( ATTRIBUTE_XMLNS_MENU ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_MENU )) ); + OUString( XMLNS_MENU ) ); - pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )), + pList->AddAttribute( OUString( ATTRIBUTE_NS_ID ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "menubar" )) ); + OUString( "menubar" ) ); - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUBAR )), pList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_MENUBAR ), pList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); WriteMenu( m_xMenuBarContainer ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUBAR )) ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_MENUBAR ) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); m_xWriteDocumentHandler->endDocument(); } @@ -840,9 +840,9 @@ throw ( SAXException, RuntimeException ) aAny = rMenuContainer->getByIndex( nItemPos ); if ( aAny >>= aProps ) { - ::rtl::OUString aCommandURL; - ::rtl::OUString aLabel; - ::rtl::OUString aHelpURL; + OUString aCommandURL; + OUString aLabel; + OUString aHelpURL; sal_Int16 nType( ::com::sun::star::ui::ItemType::DEFAULT ); sal_Int16 nItemBits( 0 ); Reference< XIndexAccess > xSubMenu; @@ -861,28 +861,28 @@ throw ( SAXException, RuntimeException ) ::comphelper::AttributeList* pListMenu = new ::comphelper::AttributeList; Reference< XAttributeList > xListMenu( (XAttributeList *)pListMenu , UNO_QUERY ); - pListMenu->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )), + pListMenu->AddAttribute( OUString( ATTRIBUTE_NS_ID ), m_aAttributeType, aCommandURL ); if ( !( aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL))) ) - pListMenu->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )), + pListMenu->AddAttribute( OUString( ATTRIBUTE_NS_LABEL ), m_aAttributeType, aLabel ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )), xListMenu ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )), m_xEmptyList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_MENU ), xListMenu ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_MENUPOPUP ), m_xEmptyList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); WriteMenu( xSubMenu ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )) ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_MENUPOPUP ) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_MENU ) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); bSeparator = sal_False; } } @@ -908,31 +908,31 @@ throw ( SAXException, RuntimeException ) } -void OWriteMenuDocumentHandler::WriteMenuItem( const ::rtl::OUString& aCommandURL, const ::rtl::OUString& aLabel, const ::rtl::OUString& aHelpURL, sal_Int16 nStyle ) +void OWriteMenuDocumentHandler::WriteMenuItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle ) { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY ); - pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )), + pList->AddAttribute( OUString( ATTRIBUTE_NS_ID ), m_aAttributeType, aCommandURL ); if ( !aHelpURL.isEmpty() ) { - pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_HELPID )), + pList->AddAttribute( OUString( ATTRIBUTE_NS_HELPID ), m_aAttributeType, aHelpURL ); } if ( !aLabel.isEmpty() && !aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL)) ) { - pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )), + pList->AddAttribute( OUString( ATTRIBUTE_NS_LABEL ), m_aAttributeType, aLabel ); } if (( nStyle > 0 ) && !( aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL)) )) { - rtl::OUString aValue; + OUString aValue; MenuStyleItem* pStyle = MenuItemStyles; for ( sal_Int32 nIndex = 0; nIndex < nMenuStyleItemEntries; ++nIndex, ++pStyle ) @@ -940,28 +940,28 @@ void OWriteMenuDocumentHandler::WriteMenuItem( const ::rtl::OUString& aCommandUR if ( nStyle & pStyle->nBit ) { if ( !aValue.isEmpty() ) - aValue = aValue.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("+") ) ); - aValue += rtl::OUString::createFromAscii( pStyle->attrName ); + aValue = aValue.concat( OUString( "+" ) ); + aValue += OUString::createFromAscii( pStyle->attrName ); } } - pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_STYLE )), + pList->AddAttribute( OUString( ATTRIBUTE_NS_STYLE ), m_aAttributeType, aValue ); } - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUITEM )), xList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUITEM )) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_MENUITEM ), xList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_MENUITEM ) ); } void OWriteMenuDocumentHandler::WriteMenuSeparator() { - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUSEPARATOR )), m_xEmptyList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUSEPARATOR )) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_MENUSEPARATOR ), m_xEmptyList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_MENUSEPARATOR ) ); } } // namespace framework diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx index 1e9c529cad93..3a9e25649c37 100644 --- a/framework/source/fwe/xml/saxnamespacefilter.cxx +++ b/framework/source/fwe/xml/saxnamespacefilter.cxx @@ -43,8 +43,8 @@ SaxNamespaceFilter::SaxNamespaceFilter( Reference< XDocumentHandler >& rSax1Docu m_xLocator( 0 ), xDocumentHandler( rSax1DocumentHandler ), m_nDepth( 0 ), - m_aXMLAttributeNamespace( RTL_CONSTASCII_USTRINGPARAM( "xmlns" )), - m_aXMLAttributeType( RTL_CONSTASCII_USTRINGPARAM( "CDATA" )) + m_aXMLAttributeNamespace( "xmlns" ), + m_aXMLAttributeType( "CDATA" ) { } @@ -64,7 +64,7 @@ void SAL_CALL SaxNamespaceFilter::endDocument(void) } void SAL_CALL SaxNamespaceFilter::startElement( - const rtl::OUString& rName, const Reference< XAttributeList > &xAttribs ) + const OUString& rName, const Reference< XAttributeList > &xAttribs ) throw( SAXException, RuntimeException ) { XMLNamespaces aXMLNamespaces; @@ -78,7 +78,7 @@ void SAL_CALL SaxNamespaceFilter::startElement( { for ( sal_Int16 i=0; i< xAttribs->getLength(); i++ ) { - ::rtl::OUString aName = xAttribs->getNameByIndex( i ); + OUString aName = xAttribs->getNameByIndex( i ); if ( aName.compareTo( m_aXMLAttributeNamespace, m_aXMLAttributeNamespace.getLength() ) == 0 ) aXMLNamespaces.addNamespace( aName, xAttribs->getValueByIndex( i )); else @@ -96,19 +96,19 @@ void SAL_CALL SaxNamespaceFilter::startElement( aAttributeIndexes.begin()); i != aAttributeIndexes.end(); ++i ) { - ::rtl::OUString aAttributeName = xAttribs->getNameByIndex( *i ); - ::rtl::OUString aValue = xAttribs->getValueByIndex( *i ); - ::rtl::OUString aNamespaceAttributeName = aXMLNamespaces.applyNSToAttributeName( aAttributeName ); + OUString aAttributeName = xAttribs->getNameByIndex( *i ); + OUString aValue = xAttribs->getValueByIndex( *i ); + OUString aNamespaceAttributeName = aXMLNamespaces.applyNSToAttributeName( aAttributeName ); pNewList->AddAttribute( aNamespaceAttributeName, m_aXMLAttributeType, aValue ); } } catch ( SAXException& e ) { - e.Message = ::rtl::OUString( getErrorLineString() + e.Message ); + e.Message = OUString( getErrorLineString() + e.Message ); throw; } - ::rtl::OUString aNamespaceElementName; + OUString aNamespaceElementName; try { @@ -116,18 +116,18 @@ void SAL_CALL SaxNamespaceFilter::startElement( } catch ( SAXException& e ) { - e.Message = ::rtl::OUString( getErrorLineString() + e.Message ); + e.Message = OUString( getErrorLineString() + e.Message ); throw; } xDocumentHandler->startElement( aNamespaceElementName, pNewList ); } -void SAL_CALL SaxNamespaceFilter::endElement(const rtl::OUString& aName) +void SAL_CALL SaxNamespaceFilter::endElement(const OUString& aName) throw( SAXException, RuntimeException ) { XMLNamespaces& aXMLNamespaces = m_aNamespaceStack.top(); - ::rtl::OUString aNamespaceElementName; + OUString aNamespaceElementName; try { @@ -135,7 +135,7 @@ void SAL_CALL SaxNamespaceFilter::endElement(const rtl::OUString& aName) } catch ( SAXException& e ) { - e.Message = ::rtl::OUString( getErrorLineString() + e.Message ); + e.Message = OUString( getErrorLineString() + e.Message ); throw; } @@ -143,20 +143,20 @@ void SAL_CALL SaxNamespaceFilter::endElement(const rtl::OUString& aName) m_aNamespaceStack.pop(); } -void SAL_CALL SaxNamespaceFilter::characters(const rtl::OUString& aChars) +void SAL_CALL SaxNamespaceFilter::characters(const OUString& aChars) throw( SAXException, RuntimeException ) { xDocumentHandler->characters( aChars ); } -void SAL_CALL SaxNamespaceFilter::ignorableWhitespace(const rtl::OUString& aWhitespaces) +void SAL_CALL SaxNamespaceFilter::ignorableWhitespace(const OUString& aWhitespaces) throw( SAXException, RuntimeException ) { xDocumentHandler->ignorableWhitespace( aWhitespaces ); } void SAL_CALL SaxNamespaceFilter::processingInstruction( - const rtl::OUString& aTarget, const rtl::OUString& aData) + const OUString& aTarget, const OUString& aData) throw( SAXException, RuntimeException ) { xDocumentHandler->processingInstruction( aTarget, aData ); @@ -170,17 +170,17 @@ void SAL_CALL SaxNamespaceFilter::setDocumentLocator( xDocumentHandler->setDocumentLocator( xLocator ); } -::rtl::OUString SaxNamespaceFilter::getErrorLineString() +OUString SaxNamespaceFilter::getErrorLineString() { char buffer[32]; if ( m_xLocator.is() ) { snprintf( buffer, sizeof(buffer), "Line: %ld - ", static_cast<long>( m_xLocator->getLineNumber() )); - return ::rtl::OUString::createFromAscii( buffer ); + return OUString::createFromAscii( buffer ); } else - return ::rtl::OUString(); + return OUString(); } } // namespace diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index 07a28706100a..ed6b352f5b93 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -93,8 +93,8 @@ static const char ITEM_DESCRIPTOR_TYPE[] = "Type"; static void ExtractStatusbarItemParameters( const Sequence< PropertyValue > rProp, - ::rtl::OUString& rCommandURL, - ::rtl::OUString& rHelpURL, + OUString& rCommandURL, + OUString& rHelpURL, sal_Int16& rOffset, sal_Int16& rStyle, sal_Int16& rWidth ) @@ -151,25 +151,25 @@ OReadStatusBarDocumentHandler::OReadStatusBarDocumentHandler( ThreadHelpBase( &Application::GetSolarMutex() ), m_aStatusBarItems( rStatusBarItems ) { - ::rtl::OUString aNamespaceStatusBar( RTL_CONSTASCII_USTRINGPARAM( XMLNS_STATUSBAR )); - ::rtl::OUString aNamespaceXLink( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK )); - ::rtl::OUString aSeparator( RTL_CONSTASCII_USTRINGPARAM( XMLNS_FILTER_SEPARATOR )); + OUString aNamespaceStatusBar( XMLNS_STATUSBAR ); + OUString aNamespaceXLink( XMLNS_XLINK ); + OUString aSeparator( XMLNS_FILTER_SEPARATOR ); // create hash map for ( int i = 0; i < (int)SB_XML_ENTRY_COUNT; i++ ) { if ( StatusBarEntries[i].nNamespace == SB_NS_STATUSBAR ) { - ::rtl::OUString temp( aNamespaceStatusBar ); + OUString temp( aNamespaceStatusBar ); temp += aSeparator; - temp += ::rtl::OUString::createFromAscii( StatusBarEntries[i].aEntryName ); + temp += OUString::createFromAscii( StatusBarEntries[i].aEntryName ); m_aStatusBarMap.insert( StatusBarHashMap::value_type( temp, (StatusBar_XML_Entry)i ) ); } else { - ::rtl::OUString temp( aNamespaceXLink ); + OUString temp( aNamespaceXLink ); temp += aSeparator; - temp += ::rtl::OUString::createFromAscii( StatusBarEntries[i].aEntryName ); + temp += OUString::createFromAscii( StatusBarEntries[i].aEntryName ); m_aStatusBarMap.insert( StatusBarHashMap::value_type( temp, (StatusBar_XML_Entry)i ) ); } } @@ -197,14 +197,14 @@ throw( SAXException, RuntimeException ) if (( m_bStatusBarStartFound && !m_bStatusBarEndFound ) || ( !m_bStatusBarStartFound && m_bStatusBarEndFound ) ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No matching start or end element 'statusbar' found!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "No matching start or end element 'statusbar' found!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } void SAL_CALL OReadStatusBarDocumentHandler::startElement( - const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttribs ) + const OUString& aName, const Reference< XAttributeList > &xAttribs ) throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -218,8 +218,8 @@ throw( SAXException, RuntimeException ) { if ( m_bStatusBarStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'statusbar:statusbar' cannot be embeded into 'statusbar:statusbar'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element 'statusbar:statusbar' cannot be embeded into 'statusbar:statusbar'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -231,20 +231,20 @@ throw( SAXException, RuntimeException ) { if ( !m_bStatusBarStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'statusbar:statusbaritem' must be embeded into element 'statusbar:statusbar'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element 'statusbar:statusbaritem' must be embeded into element 'statusbar:statusbar'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } if ( m_bStatusBarItemStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element statusbar:statusbaritem is not a container!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element statusbar:statusbaritem is not a container!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - ::rtl::OUString aCommandURL; - ::rtl::OUString aHelpURL; + OUString aCommandURL; + OUString aHelpURL; sal_Int16 nItemBits( ItemStyle::ALIGN_CENTER|ItemStyle::DRAW_IN3D ); sal_Int16 nWidth( 0 ); sal_Int16 nOffset( STATUSBAR_OFFSET ); @@ -283,8 +283,8 @@ throw( SAXException, RuntimeException ) } else { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Attribute statusbar:align must have one value of 'left','right' or 'center'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Attribute statusbar:align must have one value of 'left','right' or 'center'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -308,8 +308,8 @@ throw( SAXException, RuntimeException ) } else { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Attribute statusbar:autosize must have value 'true' or 'false'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Attribute statusbar:autosize must have value 'true' or 'false'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -323,8 +323,8 @@ throw( SAXException, RuntimeException ) nItemBits &= ~ItemStyle::AUTO_SIZE; else { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Attribute statusbar:autosize must have value 'true' or 'false'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Attribute statusbar:autosize must have value 'true' or 'false'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -338,8 +338,8 @@ throw( SAXException, RuntimeException ) nItemBits &= ~ItemStyle::OWNER_DRAW; else { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Attribute statusbar:ownerdraw must have value 'true' or 'false'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Attribute statusbar:ownerdraw must have value 'true' or 'false'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -371,19 +371,19 @@ throw( SAXException, RuntimeException ) if ( !bCommandURL ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute statusbar:url must have a value!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Required attribute statusbar:url must have a value!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } else { Sequence< PropertyValue > aStatusbarItemProp( 6 ); - aStatusbarItemProp[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL )); - aStatusbarItemProp[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL )); - aStatusbarItemProp[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_OFFSET )); - aStatusbarItemProp[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_STYLE )); - aStatusbarItemProp[4].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_WIDTH )); - aStatusbarItemProp[5].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE )); + aStatusbarItemProp[0].Name = OUString( ITEM_DESCRIPTOR_COMMANDURL ); + aStatusbarItemProp[1].Name = OUString( ITEM_DESCRIPTOR_HELPURL ); + aStatusbarItemProp[2].Name = OUString( ITEM_DESCRIPTOR_OFFSET ); + aStatusbarItemProp[3].Name = OUString( ITEM_DESCRIPTOR_STYLE ); + aStatusbarItemProp[4].Name = OUString( ITEM_DESCRIPTOR_WIDTH ); + aStatusbarItemProp[5].Name = OUString( ITEM_DESCRIPTOR_TYPE ); aStatusbarItemProp[0].Value <<= aCommandURL; aStatusbarItemProp[1].Value <<= aHelpURL; @@ -403,7 +403,7 @@ throw( SAXException, RuntimeException ) } } -void SAL_CALL OReadStatusBarDocumentHandler::endElement(const ::rtl::OUString& aName) +void SAL_CALL OReadStatusBarDocumentHandler::endElement(const OUString& aName) throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -417,8 +417,8 @@ throw( SAXException, RuntimeException ) { if ( !m_bStatusBarStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "End element 'statusbar' found, but no start element 'statusbar'" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "End element 'statusbar' found, but no start element 'statusbar'" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -430,8 +430,8 @@ throw( SAXException, RuntimeException ) { if ( !m_bStatusBarItemStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "End element 'statusbar:statusbaritem' found, but no start element 'statusbar:statusbaritem'" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "End element 'statusbar:statusbaritem' found, but no start element 'statusbar:statusbaritem'" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -445,18 +445,18 @@ throw( SAXException, RuntimeException ) } } -void SAL_CALL OReadStatusBarDocumentHandler::characters(const ::rtl::OUString&) +void SAL_CALL OReadStatusBarDocumentHandler::characters(const OUString&) throw( SAXException, RuntimeException ) { } -void SAL_CALL OReadStatusBarDocumentHandler::ignorableWhitespace(const ::rtl::OUString&) +void SAL_CALL OReadStatusBarDocumentHandler::ignorableWhitespace(const OUString&) throw( SAXException, RuntimeException ) { } void SAL_CALL OReadStatusBarDocumentHandler::processingInstruction( - const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) + const OUString& /*aTarget*/, const OUString& /*aData*/ ) throw( SAXException, RuntimeException ) { } @@ -470,7 +470,7 @@ throw( SAXException, RuntimeException ) m_xLocator = xLocator; } -::rtl::OUString OReadStatusBarDocumentHandler::getErrorLineString() +OUString OReadStatusBarDocumentHandler::getErrorLineString() { ResetableGuard aGuard( m_aLock ); @@ -479,10 +479,10 @@ throw( SAXException, RuntimeException ) if ( m_xLocator.is() ) { snprintf( buffer, sizeof(buffer), "Line: %ld - ", static_cast<long>( m_xLocator->getLineNumber() )); - return ::rtl::OUString::createFromAscii( buffer ); + return OUString::createFromAscii( buffer ); } else - return ::rtl::OUString(); + return OUString(); } @@ -499,9 +499,9 @@ OWriteStatusBarDocumentHandler::OWriteStatusBarDocumentHandler( { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); - m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); - m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); - m_aXMLStatusBarNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_STATUSBAR_PREFIX )); + m_aAttributeType = OUString( ATTRIBUTE_TYPE_CDATA ); + m_aXMLXlinkNS = OUString( XMLNS_XLINK_PREFIX ); + m_aXMLStatusBarNS = OUString( XMLNS_STATUSBAR_PREFIX ); } OWriteStatusBarDocumentHandler::~OWriteStatusBarDocumentHandler() @@ -519,23 +519,23 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw Reference< XExtendedDocumentHandler > xExtendedDocHandler( m_xWriteDocumentHandler, UNO_QUERY ); if ( xExtendedDocHandler.is() ) { - xExtendedDocHandler->unknown( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STATUSBAR_DOCTYPE )) ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + xExtendedDocHandler->unknown( OUString( STATUSBAR_DOCTYPE ) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); } ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY ); - pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_STATUSBAR )), + pList->AddAttribute( OUString( ATTRIBUTE_XMLNS_STATUSBAR ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_STATUSBAR )) ); + OUString( XMLNS_STATUSBAR ) ); - pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_XLINK )), + pList->AddAttribute( OUString( ATTRIBUTE_XMLNS_XLINK ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK )) ); + OUString( XMLNS_XLINK ) ); - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_STATUSBAR )), pList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_STATUSBAR ), pList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); sal_Int32 nItemCount = m_aStatusBarItems->getCount(); Any aAny; @@ -546,8 +546,8 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw aAny = m_aStatusBarItems->getByIndex( nItemPos ); if ( aAny >>= aProps ) { - ::rtl::OUString aCommandURL; - ::rtl::OUString aHelpURL; + OUString aCommandURL; + OUString aHelpURL; sal_Int16 nStyle( ItemStyle::ALIGN_CENTER|ItemStyle::DRAW_IN3D ); sal_Int16 nWidth( 0 ); sal_Int16 nOffset( STATUSBAR_OFFSET ); @@ -565,9 +565,9 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw } } - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_STATUSBAR )) ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_STATUSBAR ) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); m_xWriteDocumentHandler->endDocument(); } @@ -576,8 +576,8 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw //_________________________________________________________________________________________________________________ void OWriteStatusBarDocumentHandler::WriteStatusBarItem( - const rtl::OUString& rCommandURL, - const rtl::OUString& /*rHelpURL*/, + const OUString& rCommandURL, + const OUString& /*rHelpURL*/, sal_Int16 nOffset, sal_Int16 nStyle, sal_Int16 nWidth ) @@ -589,7 +589,7 @@ throw ( SAXException, RuntimeException ) if (m_aAttributeURL.isEmpty() ) { m_aAttributeURL = m_aXMLXlinkNS; - m_aAttributeURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_URL )); + m_aAttributeURL += OUString( ATTRIBUTE_URL ); } // save required attribute (URL) @@ -598,73 +598,73 @@ throw ( SAXException, RuntimeException ) // alignment if ( nStyle & ItemStyle::ALIGN_RIGHT ) { - pList->AddAttribute( m_aXMLStatusBarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ALIGN )), + pList->AddAttribute( m_aXMLStatusBarNS + OUString( ATTRIBUTE_ALIGN ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ALIGN_RIGHT )) ); + OUString( ATTRIBUTE_ALIGN_RIGHT ) ); } else if ( nStyle & ItemStyle::ALIGN_CENTER ) { - pList->AddAttribute( m_aXMLStatusBarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ALIGN )), + pList->AddAttribute( m_aXMLStatusBarNS + OUString( ATTRIBUTE_ALIGN ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ALIGN_CENTER )) ); + OUString( ATTRIBUTE_ALIGN_CENTER ) ); } else { - pList->AddAttribute( m_aXMLStatusBarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ALIGN )), + pList->AddAttribute( m_aXMLStatusBarNS + OUString( ATTRIBUTE_ALIGN ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ALIGN_LEFT )) ); + OUString( ATTRIBUTE_ALIGN_LEFT ) ); } // style ( SIB_IN is default ) if ( nStyle & ItemStyle::DRAW_FLAT ) { - pList->AddAttribute( m_aXMLStatusBarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_STYLE )), + pList->AddAttribute( m_aXMLStatusBarNS + OUString( ATTRIBUTE_STYLE ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_STYLE_FLAT )) ); + OUString( ATTRIBUTE_STYLE_FLAT ) ); } else if ( nStyle & ItemStyle::DRAW_OUT3D ) { - pList->AddAttribute( m_aXMLStatusBarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_STYLE )), + pList->AddAttribute( m_aXMLStatusBarNS + OUString( ATTRIBUTE_STYLE ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_STYLE_OUT )) ); + OUString( ATTRIBUTE_STYLE_OUT ) ); } // autosize (default sal_False) if ( nStyle & ItemStyle::AUTO_SIZE ) { - pList->AddAttribute( m_aXMLStatusBarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_AUTOSIZE )), + pList->AddAttribute( m_aXMLStatusBarNS + OUString( ATTRIBUTE_AUTOSIZE ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_BOOLEAN_TRUE )) ); + OUString( ATTRIBUTE_BOOLEAN_TRUE ) ); } // ownerdraw (default sal_False) if ( nStyle & ItemStyle::OWNER_DRAW ) { - pList->AddAttribute( m_aXMLStatusBarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_OWNERDRAW )), + pList->AddAttribute( m_aXMLStatusBarNS + OUString( ATTRIBUTE_OWNERDRAW ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_BOOLEAN_TRUE )) ); + OUString( ATTRIBUTE_BOOLEAN_TRUE ) ); } // width (default 0) if ( nWidth > 0 ) { - pList->AddAttribute( m_aXMLStatusBarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_WIDTH )), + pList->AddAttribute( m_aXMLStatusBarNS + OUString( ATTRIBUTE_WIDTH ), m_aAttributeType, - ::rtl::OUString::valueOf( (sal_Int32)nWidth ) ); + OUString::valueOf( (sal_Int32)nWidth ) ); } // offset (default STATUSBAR_OFFSET) if ( nOffset != STATUSBAR_OFFSET ) { - pList->AddAttribute( m_aXMLStatusBarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_OFFSET )), + pList->AddAttribute( m_aXMLStatusBarNS + OUString( ATTRIBUTE_OFFSET ), m_aAttributeType, - ::rtl::OUString::valueOf( (sal_Int32)nOffset ) ); + OUString::valueOf( (sal_Int32)nOffset ) ); } - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_STATUSBARITEM )), xList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_STATUSBARITEM )) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_STATUSBARITEM ), xList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_STATUSBARITEM ) ); } } // namespace framework diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 017a0418efd7..9aecb6bd6c5a 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -60,10 +60,10 @@ static const char ITEM_DESCRIPTOR_VISIBLE[] = "IsVisible"; static const char ITEM_DESCRIPTOR_WIDTH[] = "Width"; static void ExtractToolbarParameters( const Sequence< PropertyValue > rProp, - ::rtl::OUString& rCommandURL, - ::rtl::OUString& rLabel, - ::rtl::OUString& rHelpURL, - ::rtl::OUString& rTooltip, + OUString& rCommandURL, + OUString& rLabel, + OUString& rHelpURL, + OUString& rTooltip, sal_Int16& rStyle, sal_Int16& rWidth, sal_Bool& rVisible, @@ -141,47 +141,47 @@ ToolBarEntryProperty ToolBoxEntries[OReadToolBoxDocumentHandler::TB_XML_ENTRY_CO OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XIndexContainer >& rItemContainer ) : ThreadHelpBase( &Application::GetSolarMutex() ), m_rItemContainer( rItemContainer ), - m_aType( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE )), - m_aLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL )), - m_aStyle( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_STYLE )), - m_aHelpURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL )), - m_aTooltip( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TOOLTIP )), - m_aIsVisible( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_VISIBLE )), - m_aCommandURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL )) + m_aType( ITEM_DESCRIPTOR_TYPE ), + m_aLabel( ITEM_DESCRIPTOR_LABEL ), + m_aStyle( ITEM_DESCRIPTOR_STYLE ), + m_aHelpURL( ITEM_DESCRIPTOR_HELPURL ), + m_aTooltip( ITEM_DESCRIPTOR_TOOLTIP ), + m_aIsVisible( ITEM_DESCRIPTOR_VISIBLE ), + m_aCommandURL( ITEM_DESCRIPTOR_COMMANDURL ) { - ::rtl::OUString aNamespaceToolBar( RTL_CONSTASCII_USTRINGPARAM( XMLNS_TOOLBAR )); - ::rtl::OUString aNamespaceXLink( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK )); - ::rtl::OUString aSeparator( RTL_CONSTASCII_USTRINGPARAM( XMLNS_FILTER_SEPARATOR )); + OUString aNamespaceToolBar( XMLNS_TOOLBAR ); + OUString aNamespaceXLink( XMLNS_XLINK ); + OUString aSeparator( XMLNS_FILTER_SEPARATOR ); // create hash map for ( int i = 0; i < (int)TB_XML_ENTRY_COUNT; i++ ) { if ( ToolBoxEntries[i].nNamespace == TB_NS_TOOLBAR ) { - ::rtl::OUString temp( aNamespaceToolBar ); + OUString temp( aNamespaceToolBar ); temp += aSeparator; - temp += ::rtl::OUString::createFromAscii( ToolBoxEntries[i].aEntryName ); + temp += OUString::createFromAscii( ToolBoxEntries[i].aEntryName ); m_aToolBoxMap.insert( ToolBoxHashMap::value_type( temp, (ToolBox_XML_Entry)i ) ); } else { - ::rtl::OUString temp( aNamespaceXLink ); + OUString temp( aNamespaceXLink ); temp += aSeparator; - temp += ::rtl::OUString::createFromAscii( ToolBoxEntries[i].aEntryName ); + temp += OUString::createFromAscii( ToolBoxEntries[i].aEntryName ); m_aToolBoxMap.insert( ToolBoxHashMap::value_type( temp, (ToolBox_XML_Entry)i ) ); } } // pre-calculate a hash code for all style strings to speed up xml read process - m_nHashCode_Style_Radio = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO )).hashCode(); - m_nHashCode_Style_Auto = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_AUTO )).hashCode(); - m_nHashCode_Style_Left = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_LEFT )).hashCode(); - m_nHashCode_Style_AutoSize = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_AUTOSIZE )).hashCode(); - m_nHashCode_Style_DropDown = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_DROPDOWN )).hashCode(); - m_nHashCode_Style_Repeat = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_REPEAT )).hashCode(); - m_nHashCode_Style_DropDownOnly = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY )).hashCode(); - m_nHashCode_Style_Text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT )).hashCode(); - m_nHashCode_Style_Image = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE )).hashCode(); + m_nHashCode_Style_Radio = OUString( ATTRIBUTE_ITEMSTYLE_RADIO ).hashCode(); + m_nHashCode_Style_Auto = OUString( ATTRIBUTE_ITEMSTYLE_AUTO ).hashCode(); + m_nHashCode_Style_Left = OUString( ATTRIBUTE_ITEMSTYLE_LEFT ).hashCode(); + m_nHashCode_Style_AutoSize = OUString( ATTRIBUTE_ITEMSTYLE_AUTOSIZE ).hashCode(); + m_nHashCode_Style_DropDown = OUString( ATTRIBUTE_ITEMSTYLE_DROPDOWN ).hashCode(); + m_nHashCode_Style_Repeat = OUString( ATTRIBUTE_ITEMSTYLE_REPEAT ).hashCode(); + m_nHashCode_Style_DropDownOnly = OUString( ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY ).hashCode(); + m_nHashCode_Style_Text = OUString( ATTRIBUTE_ITEMSTYLE_TEXT ).hashCode(); + m_nHashCode_Style_Image = OUString( ATTRIBUTE_ITEMSTYLE_IMAGE ).hashCode(); m_bToolBarStartFound = sal_False; m_bToolBarEndFound = sal_False; @@ -209,14 +209,14 @@ throw( SAXException, RuntimeException ) if (( m_bToolBarStartFound && !m_bToolBarEndFound ) || ( !m_bToolBarStartFound && m_bToolBarEndFound ) ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No matching start or end element 'toolbar' found!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "No matching start or end element 'toolbar' found!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } void SAL_CALL OReadToolBoxDocumentHandler::startElement( - const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttribs ) + const OUString& aName, const Reference< XAttributeList > &xAttribs ) throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -230,14 +230,14 @@ throw( SAXException, RuntimeException ) { if ( m_bToolBarStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'toolbar:toolbar' cannot be embeded into 'toolbar:toolbar'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element 'toolbar:toolbar' cannot be embeded into 'toolbar:toolbar'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } else { // Check if we have a UI name set in our XML file - ::rtl::OUString aUIName; + OUString aUIName; for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ ) { pToolBoxEntry = m_aToolBoxMap.find( xAttribs->getNameByIndex( n ) ); @@ -262,7 +262,7 @@ throw( SAXException, RuntimeException ) { try { - xPropSet->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" )), makeAny( aUIName ) ); + xPropSet->setPropertyValue( OUString( "UIName" ), makeAny( aUIName ) ); } catch ( const UnknownPropertyException& ) { @@ -279,8 +279,8 @@ throw( SAXException, RuntimeException ) { if ( !m_bToolBarStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'toolbar:toolbaritem' must be embeded into element 'toolbar:toolbar'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element 'toolbar:toolbaritem' must be embeded into element 'toolbar:toolbar'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -289,19 +289,19 @@ throw( SAXException, RuntimeException ) m_bToolBarSpaceStartFound || m_bToolBarItemStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element toolbar:toolbaritem is not a container!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element toolbar:toolbaritem is not a container!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } sal_Bool bAttributeURL = sal_False; m_bToolBarItemStartFound = sal_True; - ::rtl::OUString aLabel; - ::rtl::OUString aCommandURL; - ::rtl::OUString aHelpURL; - ::rtl::OUString aTooltip; - ::rtl::OUString aBitmapName; + OUString aLabel; + OUString aCommandURL; + OUString aHelpURL; + OUString aTooltip; + OUString aBitmapName; sal_uInt16 nItemBits( 0 ); sal_Bool bVisible( sal_True ); @@ -345,8 +345,8 @@ throw( SAXException, RuntimeException ) bVisible = sal_False; else { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Attribute toolbar:visible must have value 'true' or 'false'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Attribute toolbar:visible must have value 'true' or 'false'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -367,12 +367,12 @@ throw( SAXException, RuntimeException ) case TB_ATTRIBUTE_STYLE: { // read space separated item style list - ::rtl::OUString aTemp = xAttribs->getValueByIndex( n ); + OUString aTemp = xAttribs->getValueByIndex( n ); sal_Int32 nIndex = 0; do { - ::rtl::OUString aToken = aTemp.getToken( 0, ' ', nIndex ); + OUString aToken = aTemp.getToken( 0, ' ', nIndex ); if ( !aToken.isEmpty() ) { sal_Int32 nHashCode = aToken.hashCode(); @@ -407,8 +407,8 @@ throw( SAXException, RuntimeException ) if ( !bAttributeURL ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute toolbar:url must have a value!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Required attribute toolbar:url must have a value!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -460,8 +460,8 @@ throw( SAXException, RuntimeException ) m_bToolBarSpaceStartFound || m_bToolBarItemStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element toolbar:toolbarspace is not a container!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element toolbar:toolbarspace is not a container!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -471,7 +471,7 @@ throw( SAXException, RuntimeException ) aToolbarItemProp[0].Name = m_aCommandURL; aToolbarItemProp[1].Name = m_aType; - aToolbarItemProp[0].Value <<= rtl::OUString(); + aToolbarItemProp[0].Value <<= OUString(); aToolbarItemProp[1].Value <<= ::com::sun::star::ui::ItemType::SEPARATOR_SPACE; m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) ); @@ -485,8 +485,8 @@ throw( SAXException, RuntimeException ) m_bToolBarSpaceStartFound || m_bToolBarItemStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element toolbar:toolbarbreak is not a container!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element toolbar:toolbarbreak is not a container!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -496,7 +496,7 @@ throw( SAXException, RuntimeException ) aToolbarItemProp[0].Name = m_aCommandURL; aToolbarItemProp[1].Name = m_aType; - aToolbarItemProp[0].Value <<= rtl::OUString(); + aToolbarItemProp[0].Value <<= OUString(); aToolbarItemProp[1].Value <<= ::com::sun::star::ui::ItemType::SEPARATOR_LINEBREAK; m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) ); @@ -510,8 +510,8 @@ throw( SAXException, RuntimeException ) m_bToolBarSpaceStartFound || m_bToolBarItemStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element toolbar:toolbarseparator is not a container!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element toolbar:toolbarseparator is not a container!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -521,7 +521,7 @@ throw( SAXException, RuntimeException ) aToolbarItemProp[0].Name = m_aCommandURL; aToolbarItemProp[1].Name = m_aType; - aToolbarItemProp[0].Value <<= rtl::OUString(); + aToolbarItemProp[0].Value <<= OUString(); aToolbarItemProp[1].Value <<= ::com::sun::star::ui::ItemType::SEPARATOR_LINE; m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) ); @@ -534,7 +534,7 @@ throw( SAXException, RuntimeException ) } } -void SAL_CALL OReadToolBoxDocumentHandler::endElement(const ::rtl::OUString& aName) +void SAL_CALL OReadToolBoxDocumentHandler::endElement(const OUString& aName) throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -548,8 +548,8 @@ throw( SAXException, RuntimeException ) { if ( !m_bToolBarStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "End element 'toolbar' found, but no start element 'toolbar'" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "End element 'toolbar' found, but no start element 'toolbar'" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -561,8 +561,8 @@ throw( SAXException, RuntimeException ) { if ( !m_bToolBarItemStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "End element 'toolbar:toolbaritem' found, but no start element 'toolbar:toolbaritem'" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "End element 'toolbar:toolbaritem' found, but no start element 'toolbar:toolbaritem'" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -574,8 +574,8 @@ throw( SAXException, RuntimeException ) { if ( !m_bToolBarBreakStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "End element 'toolbar:toolbarbreak' found, but no start element 'toolbar:toolbarbreak'" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "End element 'toolbar:toolbarbreak' found, but no start element 'toolbar:toolbarbreak'" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -587,8 +587,8 @@ throw( SAXException, RuntimeException ) { if ( !m_bToolBarSpaceStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "End element 'toolbar:toolbarspace' found, but no start element 'toolbar:toolbarspace'" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "End element 'toolbar:toolbarspace' found, but no start element 'toolbar:toolbarspace'" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -600,8 +600,8 @@ throw( SAXException, RuntimeException ) { if ( !m_bToolBarSeparatorStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "End element 'toolbar:toolbarseparator' found, but no start element 'toolbar:toolbarseparator'" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "End element 'toolbar:toolbarseparator' found, but no start element 'toolbar:toolbarseparator'" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -615,18 +615,18 @@ throw( SAXException, RuntimeException ) } } -void SAL_CALL OReadToolBoxDocumentHandler::characters(const ::rtl::OUString&) +void SAL_CALL OReadToolBoxDocumentHandler::characters(const OUString&) throw( SAXException, RuntimeException ) { } -void SAL_CALL OReadToolBoxDocumentHandler::ignorableWhitespace(const ::rtl::OUString&) +void SAL_CALL OReadToolBoxDocumentHandler::ignorableWhitespace(const OUString&) throw( SAXException, RuntimeException ) { } void SAL_CALL OReadToolBoxDocumentHandler::processingInstruction( - const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) + const OUString& /*aTarget*/, const OUString& /*aData*/ ) throw( SAXException, RuntimeException ) { } @@ -640,7 +640,7 @@ throw( SAXException, RuntimeException ) m_xLocator = xLocator; } -::rtl::OUString OReadToolBoxDocumentHandler::getErrorLineString() +OUString OReadToolBoxDocumentHandler::getErrorLineString() { ResetableGuard aGuard( m_aLock ); @@ -649,10 +649,10 @@ throw( SAXException, RuntimeException ) if ( m_xLocator.is() ) { snprintf( buffer, sizeof(buffer), "Line: %ld - ", static_cast<long>( m_xLocator->getLineNumber() )); - return ::rtl::OUString::createFromAscii( buffer ); + return OUString::createFromAscii( buffer ); } else - return ::rtl::OUString(); + return OUString(); } @@ -669,9 +669,9 @@ OWriteToolBoxDocumentHandler::OWriteToolBoxDocumentHandler( { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); - m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); - m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); - m_aXMLToolbarNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_TOOLBAR_PREFIX )); + m_aAttributeType = OUString( ATTRIBUTE_TYPE_CDATA ); + m_aXMLXlinkNS = OUString( XMLNS_XLINK_PREFIX ); + m_aXMLToolbarNS = OUString( XMLNS_TOOLBAR_PREFIX ); } OWriteToolBoxDocumentHandler::~OWriteToolBoxDocumentHandler() @@ -689,17 +689,17 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw Reference< XExtendedDocumentHandler > xExtendedDocHandler( m_xWriteDocumentHandler, UNO_QUERY ); if ( xExtendedDocHandler.is() ) { - xExtendedDocHandler->unknown( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( TOOLBAR_DOCTYPE )) ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + xExtendedDocHandler->unknown( OUString( TOOLBAR_DOCTYPE ) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); } - ::rtl::OUString aUIName; + OUString aUIName; Reference< XPropertySet > xPropSet( m_rItemAccess, UNO_QUERY ); if ( xPropSet.is() ) { try { - xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))) >>= aUIName; + xPropSet->getPropertyValue( OUString( "UIName" )) >>= aUIName; } catch ( const UnknownPropertyException& ) { @@ -709,21 +709,21 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY ); - pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_TOOLBAR )), + pList->AddAttribute( OUString( ATTRIBUTE_XMLNS_TOOLBAR ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_TOOLBAR )) ); + OUString( XMLNS_TOOLBAR ) ); - pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_XLINK )), + pList->AddAttribute( OUString( ATTRIBUTE_XMLNS_XLINK ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK )) ); + OUString( XMLNS_XLINK ) ); if ( !aUIName.isEmpty() ) - pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_UINAME )), + pList->AddAttribute( m_aXMLToolbarNS + OUString( ATTRIBUTE_UINAME ), m_aAttributeType, aUIName ); - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBAR )), pList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_TOOLBAR ), pList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); sal_Int32 nItemCount = m_rItemAccess->getCount(); Any aAny; @@ -734,10 +734,10 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw aAny = m_rItemAccess->getByIndex( nItemPos ); if ( aAny >>= aProps ) { - ::rtl::OUString aCommandURL; - ::rtl::OUString aLabel; - ::rtl::OUString aHelpURL; - ::rtl::OUString aTooltip; + OUString aCommandURL; + OUString aLabel; + OUString aHelpURL; + OUString aTooltip; sal_Bool bVisible( sal_True ); sal_Int16 nType( ::com::sun::star::ui::ItemType::DEFAULT ); sal_Int16 nWidth( 0 ); @@ -755,9 +755,9 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw } } - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBAR )) ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_TOOLBAR ) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); m_xWriteDocumentHandler->endDocument(); } @@ -766,10 +766,10 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw //_________________________________________________________________________________________________________________ void OWriteToolBoxDocumentHandler::WriteToolBoxItem( - const ::rtl::OUString& rCommandURL, - const ::rtl::OUString& rLabel, - const ::rtl::OUString& rHelpURL, - const ::rtl::OUString& rTooltip, + const OUString& rCommandURL, + const OUString& rLabel, + const OUString& rHelpURL, + const OUString& rTooltip, sal_Int16 nStyle, sal_Int16 nWidth, sal_Bool bVisible ) @@ -781,7 +781,7 @@ throw ( SAXException, RuntimeException ) if ( m_aAttributeURL.isEmpty() ) { m_aAttributeURL = m_aXMLXlinkNS; - m_aAttributeURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_URL )); + m_aAttributeURL += OUString( ATTRIBUTE_URL ); } // save required attribute (URL) @@ -789,35 +789,35 @@ throw ( SAXException, RuntimeException ) if ( !rLabel.isEmpty() ) { - pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TEXT )), + pList->AddAttribute( m_aXMLToolbarNS + OUString( ATTRIBUTE_TEXT ), m_aAttributeType, rLabel ); } if ( bVisible == sal_False ) { - pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_VISIBLE )), + pList->AddAttribute( m_aXMLToolbarNS + OUString( ATTRIBUTE_VISIBLE ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_BOOLEAN_FALSE )) ); + OUString( ATTRIBUTE_BOOLEAN_FALSE ) ); } if ( !rHelpURL.isEmpty() ) { - pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HELPID )), + pList->AddAttribute( m_aXMLToolbarNS + OUString( ATTRIBUTE_HELPID ), m_aAttributeType, rHelpURL ); } if ( !rTooltip.isEmpty() ) { - pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TOOLTIP )), + pList->AddAttribute( m_aXMLToolbarNS + OUString( ATTRIBUTE_TOOLTIP ), m_aAttributeType, rTooltip ); } if ( nStyle > 0 ) { - rtl::OUString aValue; + OUString aValue; ToolboxStyleItem* pStyle = Styles; for ( sal_Int32 nIndex = 0; nIndex < nStyleItemEntries; ++nIndex, ++pStyle ) @@ -825,53 +825,53 @@ throw ( SAXException, RuntimeException ) if ( nStyle & pStyle->nBit ) { if ( !aValue.isEmpty() ) - aValue = aValue.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(" ") ) ); - aValue += rtl::OUString::createFromAscii( pStyle->attrName ); + aValue = aValue.concat( OUString( " " ) ); + aValue += OUString::createFromAscii( pStyle->attrName ); } } - pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE )), + pList->AddAttribute( m_aXMLToolbarNS + OUString( ATTRIBUTE_ITEMSTYLE ), m_aAttributeType, aValue ); } if ( nWidth > 0 ) { - pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_WIDTH )), + pList->AddAttribute( m_aXMLToolbarNS + OUString( ATTRIBUTE_WIDTH ), m_aAttributeType, - ::rtl::OUString::valueOf( sal_Int32( nWidth )) ); + OUString::valueOf( sal_Int32( nWidth )) ); } - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBARITEM )), xList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBARITEM )) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_TOOLBARITEM ), xList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_TOOLBARITEM ) ); } void OWriteToolBoxDocumentHandler::WriteToolBoxSpace() throw ( SAXException, RuntimeException ) { - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBARSPACE )), m_xEmptyList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBARSPACE )) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_TOOLBARSPACE ), m_xEmptyList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_TOOLBARSPACE ) ); } void OWriteToolBoxDocumentHandler::WriteToolBoxBreak() throw ( SAXException, RuntimeException ) { - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBARBREAK )), m_xEmptyList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBARBREAK )) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_TOOLBARBREAK ), m_xEmptyList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_TOOLBARBREAK ) ); } void OWriteToolBoxDocumentHandler::WriteToolBoxSeparator() throw ( SAXException, RuntimeException ) { - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBARSEPARATOR )), m_xEmptyList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBARSEPARATOR )) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_TOOLBARSEPARATOR ), m_xEmptyList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_TOOLBARSEPARATOR ) ); } } // namespace framework diff --git a/framework/source/fwe/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx index ddf15175d712..ba8b39ab7077 100644 --- a/framework/source/fwe/xml/xmlnamespaces.cxx +++ b/framework/source/fwe/xml/xmlnamespaces.cxx @@ -27,7 +27,7 @@ namespace framework { XMLNamespaces::XMLNamespaces() - : m_aXMLAttributeNamespace( RTL_CONSTASCII_USTRINGPARAM( "xmlns" )) + : m_aXMLAttributeNamespace( "xmlns" ) { } @@ -41,10 +41,10 @@ XMLNamespaces::~XMLNamespaces() { } -void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUString& aValue ) throw( SAXException ) +void XMLNamespaces::addNamespace( const OUString& aName, const OUString& aValue ) throw( SAXException ) { NamespaceMap::iterator p; - ::rtl::OUString aNamespaceName( aName ); + OUString aNamespaceName( aName ); sal_Int32 nXMLNamespaceLength = m_aXMLAttributeNamespace.getLength(); // delete preceding "xmlns" @@ -52,7 +52,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS { if ( aNamespaceName.getLength() == nXMLNamespaceLength ) { - aNamespaceName = ::rtl::OUString(); + aNamespaceName = OUString(); } else if ( aNamespaceName.getLength() >= nXMLNamespaceLength+2 ) { @@ -61,7 +61,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS else { // a xml namespace without name is not allowed (e.g. "xmlns:" ) - ::rtl::OUString aErrorMessage( RTL_CONSTASCII_USTRINGPARAM( "A xml namespace without name is not allowed!" )); + OUString aErrorMessage( "A xml namespace without name is not allowed!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -70,7 +70,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS { // namespace should be reseted - as xml draft states this is only allowed // for the default namespace - check and throw exception if check fails - ::rtl::OUString aErrorMessage( RTL_CONSTASCII_USTRINGPARAM( "Clearing xml namespace only allowed for default namespace!" )); + OUString aErrorMessage( "Clearing xml namespace only allowed for default namespace!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } else @@ -94,7 +94,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS } } -::rtl::OUString XMLNamespaces::applyNSToAttributeName( const ::rtl::OUString& aName ) const throw( SAXException ) +OUString XMLNamespaces::applyNSToAttributeName( const OUString& aName ) const throw( SAXException ) { // xml draft: there is no default namespace for attributes! @@ -103,15 +103,15 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS { if ( aName.getLength() > index+1 ) { - ::rtl::OUString aAttributeName = getNamespaceValue( aName.copy( 0, index ) ); - aAttributeName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("^")); + OUString aAttributeName = getNamespaceValue( aName.copy( 0, index ) ); + aAttributeName += OUString("^"); aAttributeName += aName.copy( index+1 ); return aAttributeName; } else { // attribute with namespace but without name "namespace:" is not allowed!! - ::rtl::OUString aErrorMessage( RTL_CONSTASCII_USTRINGPARAM( "Attribute has no name only preceding namespace!" )); + OUString aErrorMessage( "Attribute has no name only preceding namespace!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -119,13 +119,13 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS return aName; } -::rtl::OUString XMLNamespaces::applyNSToElementName( const ::rtl::OUString& aName ) const throw( SAXException ) +OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const throw( SAXException ) { // xml draft: element names can have a default namespace int index = aName.indexOf( ':' ); - ::rtl::OUString aNamespace; - ::rtl::OUString aElementName = aName; + OUString aNamespace; + OUString aElementName = aName; if ( index > 0 ) aNamespace = getNamespaceValue( aName.copy( 0, index ) ); @@ -135,7 +135,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS if ( !aNamespace.isEmpty() ) { aElementName = aNamespace; - aElementName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("^")); + aElementName += OUString("^"); } else return aName; @@ -147,7 +147,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS else { // attribute with namespace but without a name is not allowed (e.g. "cfg:" ) - ::rtl::OUString aErrorMessage( RTL_CONSTASCII_USTRINGPARAM( "Attribute has no name only preceding namespace!" )); + OUString aErrorMessage( "Attribute has no name only preceding namespace!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -157,7 +157,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS return aElementName; } -::rtl::OUString XMLNamespaces::getNamespaceValue( const ::rtl::OUString& aNamespace ) const throw( SAXException ) +OUString XMLNamespaces::getNamespaceValue( const OUString& aNamespace ) const throw( SAXException ) { if ( aNamespace.isEmpty() ) return m_aDefaultNamespace; @@ -170,7 +170,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS else { // namespace not defined => throw exception! - ::rtl::OUString aErrorMessage( RTL_CONSTASCII_USTRINGPARAM( "XML namespace used but not defined!" )); + OUString aErrorMessage( "XML namespace used but not defined!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } diff --git a/framework/source/fwi/jobs/jobconst.cxx b/framework/source/fwi/jobs/jobconst.cxx index 38e53836e1d7..a96735f6236d 100644 --- a/framework/source/fwi/jobs/jobconst.cxx +++ b/framework/source/fwi/jobs/jobconst.cxx @@ -21,21 +21,21 @@ namespace framework{ -const ::rtl::OUString JobConst::ANSWER_DEACTIVATE_JOB() +const OUString JobConst::ANSWER_DEACTIVATE_JOB() { - static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("Deactivate")); + static const OUString PROP(RTL_CONSTASCII_USTRINGPARAM("Deactivate")); return PROP; } -const ::rtl::OUString JobConst::ANSWER_SAVE_ARGUMENTS() +const OUString JobConst::ANSWER_SAVE_ARGUMENTS() { - static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SaveArguments")); + static const OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SaveArguments")); return PROP; } -const ::rtl::OUString JobConst::ANSWER_SEND_DISPATCHRESULT() +const OUString JobConst::ANSWER_SEND_DISPATCHRESULT() { - static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SendDispatchResult")); + static const OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SendDispatchResult")); return PROP; } diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 5b328ec1b073..da7085f63aeb 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -49,7 +49,7 @@ extern "C" { static int SAL_CALL compare_OUString_Property_Impl( const void *arg1, const void *arg2 ) SAL_THROW(()) { - return ((::rtl::OUString *)arg1)->compareTo( ((Property *)arg2)->Name ); + return ((OUString *)arg1)->compareTo( ((Property *)arg2)->Name ); } } @@ -63,8 +63,8 @@ public: // XPropertySetInfo-Methoden virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException); - virtual Property SAL_CALL getPropertyByName(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& PropertyName) throw(::com::sun::star::uno::RuntimeException); + virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(::com::sun::star::uno::RuntimeException); }; @@ -89,7 +89,7 @@ Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::co /** * Return the sequence of properties, which are provided throug the constructor. */ -Property OPropertySetHelperInfo_Impl::getPropertyByName( const ::rtl::OUString & PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { Property * pR; pR = (Property *)bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(), @@ -105,7 +105,7 @@ Property OPropertySetHelperInfo_Impl::getPropertyByName( const ::rtl::OUString & /** * Return the sequence of properties, which are provided throug the constructor. */ -sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const ::rtl::OUString & PropertyName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::uno::RuntimeException) { Property * pR; pR = (Property *)bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(), @@ -154,7 +154,7 @@ ConstItemContainer::ConstItemContainer( const Reference< XIndexAccess >& rSource Reference< XPropertySet > xPropSet( rSourceContainer, UNO_QUERY ); if ( xPropSet.is() ) { - xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))) >>= m_aUIName; + xPropSet->getPropertyValue( OUString( "UIName" )) >>= m_aUIName; } } catch ( const Exception& ) @@ -303,7 +303,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) if ( sal_Int32( m_aItemVector.size()) > Index ) return makeAny( m_aItemVector[Index] ); else - throw IndexOutOfBoundsException( ::rtl::OUString(), (OWeakObject *)this ); + throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this ); } // XPropertySet @@ -332,12 +332,12 @@ throw (::com::sun::star::uno::RuntimeException) return (*pInfo); } -void SAL_CALL ConstItemContainer::setPropertyValue( const ::rtl::OUString&, const Any& ) +void SAL_CALL ConstItemContainer::setPropertyValue( const OUString&, const Any& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { } -Any SAL_CALL ConstItemContainer::getPropertyValue( const ::rtl::OUString& PropertyName ) +Any SAL_CALL ConstItemContainer::getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { if ( PropertyName == PROPNAME_UINAME ) @@ -346,24 +346,24 @@ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang throw UnknownPropertyException(); } -void SAL_CALL ConstItemContainer::addPropertyChangeListener( const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) +void SAL_CALL ConstItemContainer::addPropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { } -void SAL_CALL ConstItemContainer::removePropertyChangeListener( const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) +void SAL_CALL ConstItemContainer::removePropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { // Only read-only properties - do nothing } -void SAL_CALL ConstItemContainer::addVetoableChangeListener( const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) +void SAL_CALL ConstItemContainer::addVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { // Only read-only properties - do nothing } -void SAL_CALL ConstItemContainer::removeVetoableChangeListener( const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) +void SAL_CALL ConstItemContainer::removeVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { // Only read-only properties - do nothing @@ -421,8 +421,8 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > ConstItem const com::sun::star::beans::Property pProperties[] = { - com::sun::star::beans::Property( rtl::OUString(PROPNAME_UINAME), PROPHANDLE_UINAME , - ::getCppuType((const rtl::OUString*)NULL), + com::sun::star::beans::Property( OUString(PROPNAME_UINAME), PROPHANDLE_UINAME , + ::getCppuType((const OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) }; // Use it to initialize sequence! diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx index 570394f1c802..956b2778db96 100644 --- a/framework/source/fwi/uielement/itemcontainer.cxx +++ b/framework/source/fwi/uielement/itemcontainer.cxx @@ -173,7 +173,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) if ( sal_Int32( m_aItemVector.size()) > Index ) return makeAny( m_aItemVector[Index] ); else - throw IndexOutOfBoundsException( ::rtl::OUString(), (OWeakObject *)this ); + throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this ); } // XIndexContainer @@ -193,10 +193,10 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept m_aItemVector.insert( aIter, aSeq ); } else - throw IndexOutOfBoundsException( ::rtl::OUString(), (OWeakObject *)this ); + throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this ); } else - throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( WRONG_TYPE_EXCEPTION )), + throw IllegalArgumentException( OUString( WRONG_TYPE_EXCEPTION ), (OWeakObject *)this, 2 ); } @@ -211,7 +211,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) m_aItemVector.erase( aIter ); } else - throw IndexOutOfBoundsException( ::rtl::OUString(), (OWeakObject *)this ); + throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this ); } void SAL_CALL ItemContainer::replaceByIndex( sal_Int32 Index, const Any& aItem ) @@ -224,10 +224,10 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept if ( sal_Int32( m_aItemVector.size()) > Index ) m_aItemVector[Index] = aSeq; else - throw IndexOutOfBoundsException( ::rtl::OUString(), (OWeakObject *)this ); + throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this ); } else - throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( WRONG_TYPE_EXCEPTION )), + throw IllegalArgumentException( OUString( WRONG_TYPE_EXCEPTION ), (OWeakObject *)this, 2 ); } diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index fbc5f60dc26c..9063fbee5b3e 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -94,7 +94,7 @@ RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceCo Reference< XPropertySet > xPropSet( rSourceContainer, UNO_QUERY ); if ( xPropSet.is() ) { - xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))) >>= m_aUIName; + xPropSet->getPropertyValue( OUString( "UIName" )) >>= m_aUIName; } } catch ( const Exception& ) @@ -205,7 +205,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) if ( sal_Int32( m_aItemVector.size()) > Index ) return makeAny( m_aItemVector[Index] ); else - throw IndexOutOfBoundsException( ::rtl::OUString(), (OWeakObject *)this ); + throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this ); } // XIndexContainer @@ -225,10 +225,10 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept m_aItemVector.insert( aIter, aSeq ); } else - throw IndexOutOfBoundsException( ::rtl::OUString(), (OWeakObject *)this ); + throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this ); } else - throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( WRONG_TYPE_EXCEPTION )), + throw IllegalArgumentException( OUString( WRONG_TYPE_EXCEPTION ), (OWeakObject *)this, 2 ); } @@ -243,7 +243,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) m_aItemVector.erase( aIter ); } else - throw IndexOutOfBoundsException( ::rtl::OUString(), (OWeakObject *)this ); + throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this ); } void SAL_CALL RootItemContainer::replaceByIndex( sal_Int32 Index, const Any& aItem ) @@ -256,10 +256,10 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept if ( sal_Int32( m_aItemVector.size()) > Index ) m_aItemVector[Index] = aSeq; else - throw IndexOutOfBoundsException( ::rtl::OUString(), (OWeakObject *)this ); + throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this ); } else - throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( WRONG_TYPE_EXCEPTION )), + throw IllegalArgumentException( OUString( WRONG_TYPE_EXCEPTION ), (OWeakObject *)this, 2 ); } @@ -386,8 +386,8 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > RootItemC const com::sun::star::beans::Property pProperties[] = { - com::sun::star::beans::Property( rtl::OUString(PROPNAME_UINAME), PROPHANDLE_UINAME , - ::getCppuType((const rtl::OUString*)NULL), + com::sun::star::beans::Property( OUString(PROPNAME_UINAME), PROPHANDLE_UINAME , + ::getCppuType((const OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ) }; // Use it to initialize sequence! diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index ce931f49dcc9..6908369866cb 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -80,9 +80,9 @@ bool isHorizontalDockingArea( const sal_Int32 nDockArea ) return isHorizontalDockingArea(static_cast< ui::DockingArea >( nDockArea )); } -::rtl::OUString retrieveToolbarNameFromHelpURL( Window* pWindow ) +OUString retrieveToolbarNameFromHelpURL( Window* pWindow ) { - ::rtl::OUString aToolbarName; + OUString aToolbarName; if ( pWindow->GetType() == WINDOW_TOOLBOX ) { @@ -94,7 +94,7 @@ bool isHorizontalDockingArea( const sal_Int32 nDockArea ) if ( !aToolbarName.isEmpty() && ( i > 0 ) && (( i + 1 ) < aToolbarName.getLength() )) aToolbarName = aToolbarName.copy( i+1 ); // Remove ".HelpId:" protocol from toolbar name else - aToolbarName = ::rtl::OUString(); + aToolbarName = OUString(); } } return aToolbarName; @@ -169,7 +169,7 @@ uno::Reference< awt::XWindowPeer > createToolkitWindow( const uno::Reference< un // describe window properties. css::awt::WindowDescriptor aDescriptor; aDescriptor.Type = awt::WindowClass_SIMPLE; - aDescriptor.WindowServiceName = ::rtl::OUString::createFromAscii( pService ); + aDescriptor.WindowServiceName = OUString::createFromAscii( pService ); aDescriptor.ParentIndex = -1; aDescriptor.Parent = uno::Reference< awt::XWindowPeer >( rParent, uno::UNO_QUERY ); aDescriptor.Bounds = awt::Rectangle(0,0,0,0); @@ -194,15 +194,15 @@ WindowAlign ImplConvertAlignment( sal_Int16 aAlignment ) return WINDOWALIGN_BOTTOM; } -::rtl::OUString getElementTypeFromResourceURL( const ::rtl::OUString& aResourceURL ) +OUString getElementTypeFromResourceURL( const OUString& aResourceURL ) { - ::rtl::OUString aType; + OUString aType; - ::rtl::OUString aUIResourceURL( UIRESOURCE_URL ); + OUString aUIResourceURL( UIRESOURCE_URL ); if ( aResourceURL.indexOf( aUIResourceURL ) == 0 ) { sal_Int32 nIndex = 0; - ::rtl::OUString aPathPart = aResourceURL.copy( aUIResourceURL.getLength() ); + OUString aPathPart = aResourceURL.copy( aUIResourceURL.getLength() ); aPathPart.getToken( 0, (sal_Unicode)'/', nIndex ); return aPathPart.getToken( 0, (sal_Unicode)'/', nIndex ); @@ -211,13 +211,13 @@ WindowAlign ImplConvertAlignment( sal_Int16 aAlignment ) return aType; } -void parseResourceURL( const rtl::OUString& aResourceURL, rtl::OUString& aElementType, rtl::OUString& aElementName ) +void parseResourceURL( const OUString& aResourceURL, OUString& aElementType, OUString& aElementName ) { - ::rtl::OUString aUIResourceURL( UIRESOURCE_URL ); + OUString aUIResourceURL( UIRESOURCE_URL ); if ( aResourceURL.indexOf( aUIResourceURL ) == 0 ) { sal_Int32 nIndex = 0; - ::rtl::OUString aPathPart = aResourceURL.copy( aUIResourceURL.getLength() ); + OUString aPathPart = aResourceURL.copy( aUIResourceURL.getLength() ); aPathPart.getToken( 0, (sal_Unicode)'/', nIndex ); aElementType = aPathPart.getToken( 0, (sal_Unicode)'/', nIndex ); @@ -299,9 +299,9 @@ sal_Bool implts_isFrameOrWindowTop( const uno::Reference< frame::XFrame >& xFram return sal_False; } -void impl_setDockingWindowVisibility( const css::uno::Reference< css::uno::XComponentContext>& rxContext, const css::uno::Reference< css::frame::XFrame >& rFrame, const ::rtl::OUString& rDockingWindowName, bool bVisible ) +void impl_setDockingWindowVisibility( const css::uno::Reference< css::uno::XComponentContext>& rxContext, const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName, bool bVisible ) { - const ::rtl::OUString aDockWinPrefixCommand( RTL_CONSTASCII_USTRINGPARAM( "DockingWindow" )); + const OUString aDockWinPrefixCommand( "DockingWindow" ); sal_Int32 nID = rDockingWindowName.toInt32(); sal_Int32 nIndex = nID - DOCKWIN_ID_BASE; @@ -309,10 +309,10 @@ void impl_setDockingWindowVisibility( const css::uno::Reference< css::uno::XComp css::uno::Reference< css::frame::XDispatchProvider > xProvider(rFrame, css::uno::UNO_QUERY); if ( nIndex >= 0 && xProvider.is() ) { - ::rtl::OUString aDockWinCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:" )); - ::rtl::OUString aDockWinArgName( aDockWinPrefixCommand ); + OUString aDockWinCommand( ".uno:" ); + OUString aDockWinArgName( aDockWinPrefixCommand ); - aDockWinArgName += ::rtl::OUString::valueOf( nIndex ); + aDockWinArgName += OUString::valueOf( nIndex ); css::uno::Sequence< css::beans::PropertyValue > aArgs(1); aArgs[0].Name = aDockWinArgName; @@ -324,7 +324,7 @@ void impl_setDockingWindowVisibility( const css::uno::Reference< css::uno::XComp xDispatcher->executeDispatch( xProvider, aDockWinCommand, - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), + OUString("_self"), 0, aArgs); } diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx index 0559a85cb9ba..d124c08b017a 100644 --- a/framework/source/layoutmanager/helpers.hxx +++ b/framework/source/layoutmanager/helpers.hxx @@ -37,7 +37,7 @@ #include <vcl/window.hxx> #include <vcl/toolbox.hxx> -#define UIRESOURCE_URL RTL_CONSTASCII_USTRINGPARAM( "private:resource" ) +#define UIRESOURCE_URL "private:resource" #define UIRESOURCETYPE_TOOLBAR "toolbar" #define UIRESOURCETYPE_STATUSBAR "statusbar" #define UIRESOURCETYPE_MENUBAR "menubar" @@ -52,7 +52,7 @@ bool isToolboxHorizontalAligned( ToolBox* pToolBox ); bool isReverseOrderDockingArea( const sal_Int32 nDockArea ); bool isHorizontalDockingArea( const sal_Int32 nDockArea ); bool isHorizontalDockingArea( const ::com::sun::star::ui::DockingArea& nDockArea ); -::rtl::OUString retrieveToolbarNameFromHelpURL( Window* pWindow ); +OUString retrieveToolbarNameFromHelpURL( Window* pWindow ); ToolBox* getToolboxPtr( Window* pWindow ); Window* getWindowFromXUIElement( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& xUIElement ); SystemWindow* getTopSystemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xWindow ); @@ -61,14 +61,14 @@ void setZeroRectangle( ::Rectangle& rRect ); bool lcl_checkUIElement(const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& xUIElement,::com::sun::star::awt::Rectangle& _rPosSize, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xWindow); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > createToolkitWindow( const css::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const css::uno::Reference< ::com::sun::star::awt::XWindowPeer >& rParent, const char* pService ); WindowAlign ImplConvertAlignment( sal_Int16 aAlignment ); -::rtl::OUString getElementTypeFromResourceURL( const ::rtl::OUString& aResourceURL ); -void parseResourceURL( const rtl::OUString& aResourceURL, rtl::OUString& aElementType, rtl::OUString& aElementName ); +OUString getElementTypeFromResourceURL( const OUString& aResourceURL ); +void parseResourceURL( const OUString& aResourceURL, OUString& aElementType, OUString& aElementName ); ::Rectangle putAWTToRectangle( const ::com::sun::star::awt::Rectangle& rRect ); ::com::sun::star::awt::Rectangle putRectangleValueToAWT( const ::Rectangle& rRect ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > impl_getModelFromFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); sal_Bool implts_isPreviewModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); sal_Bool implts_isFrameOrWindowTop( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); -void impl_setDockingWindowVisibility( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rDockingWindowName, bool bVisible ); +void impl_setDockingWindowVisibility( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rDockingWindowName, bool bVisible ); void impl_addWindowListeners( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xThis, const ::com::sun::star::uno::Reference< css::ui::XUIElement >& xUIElement ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > implts_createToolkitWindow( const css::uno::Reference< ::com::sun::star::awt::XToolkit2 >& rToolkit, const css::uno::Reference< ::com::sun::star::awt::XWindowPeer >& rParent ); diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 1c3852ac1619..3f35223ece09 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -66,9 +66,9 @@ ToolbarLayoutManager::ToolbarLayoutManager( m_bVisible( true ), m_bLayoutInProgress( false ), m_bToolbarCreation( false ), - m_aFullAddonTbxPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/addon_" )), - m_aCustomTbxPrefix( RTL_CONSTASCII_USTRINGPARAM( "custom_" )), - m_aCustomizeCmd( RTL_CONSTASCII_USTRINGPARAM( "ConfigureDialog" )), + m_aFullAddonTbxPrefix( "private:resource/toolbar/addon_" ), + m_aCustomTbxPrefix( "custom_" ), + m_aCustomizeCmd( "ConfigureDialog" ), m_aToolbarTypeString( RTL_CONSTASCII_USTRINGPARAM( UIRESOURCETYPE_TOOLBAR )) { // initialize rectangles to zero values @@ -417,7 +417,7 @@ void ToolbarLayoutManager::createStaticToolbars() implts_sortUIElements(); } -bool ToolbarLayoutManager::requestToolbar( const ::rtl::OUString& rResourceURL ) +bool ToolbarLayoutManager::requestToolbar( const OUString& rResourceURL ) { if (isPreviewFrame()) return false; // no toolbars for preview frame! @@ -451,7 +451,7 @@ bool ToolbarLayoutManager::requestToolbar( const ::rtl::OUString& rResourceURL ) return bNotify; } -bool ToolbarLayoutManager::createToolbar( const ::rtl::OUString& rResourceURL ) +bool ToolbarLayoutManager::createToolbar( const OUString& rResourceURL ) { bool bNotify( false ); uno::Reference< ui::XUIElement > xUITempElement; @@ -460,9 +460,9 @@ bool ToolbarLayoutManager::createToolbar( const ::rtl::OUString& rResourceURL ) return bNotify; } -bool ToolbarLayoutManager::destroyToolbar( const ::rtl::OUString& rResourceURL ) +bool ToolbarLayoutManager::destroyToolbar( const OUString& rResourceURL ) { - const rtl::OUString aAddonTbResourceName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/addon_" )); + const OUString aAddonTbResourceName( "private:resource/toolbar/addon_" ); UIElementVector::iterator pIter; uno::Reference< lang::XComponent > xComponent; @@ -562,7 +562,7 @@ void ToolbarLayoutManager::destroyToolbars() } } -bool ToolbarLayoutManager::showToolbar( const ::rtl::OUString& rResourceURL ) +bool ToolbarLayoutManager::showToolbar( const OUString& rResourceURL ) { UIElement aUIElement = implts_findToolbar( rResourceURL ); @@ -585,7 +585,7 @@ bool ToolbarLayoutManager::showToolbar( const ::rtl::OUString& rResourceURL ) return false; } -bool ToolbarLayoutManager::hideToolbar( const ::rtl::OUString& rResourceURL ) +bool ToolbarLayoutManager::hideToolbar( const OUString& rResourceURL ) { UIElement aUIElement = implts_findToolbar( rResourceURL ); @@ -691,7 +691,7 @@ void ToolbarLayoutManager::setVisible( bool bVisible ) resetDockingArea(); } -bool ToolbarLayoutManager::dockToolbar( const ::rtl::OUString& rResourceURL, ui::DockingArea eDockingArea, const awt::Point& aPos ) +bool ToolbarLayoutManager::dockToolbar( const OUString& rResourceURL, ui::DockingArea eDockingArea, const awt::Point& aPos ) { UIElement aUIElement = implts_findToolbar( rResourceURL ); @@ -777,7 +777,7 @@ bool ToolbarLayoutManager::dockToolbar( const ::rtl::OUString& rResourceURL, ui: bool ToolbarLayoutManager::dockAllToolbars() { - std::vector< ::rtl::OUString > aToolBarNameVector; + std::vector< OUString > aToolBarNameVector; ReadGuard aReadLock( m_aLock ); UIElementVector::iterator pIter; @@ -809,8 +809,8 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent ) { if ( pEvent->GetId() == VCLEVENT_TOOLBOX_SELECT ) { - ::rtl::OUString aToolbarName; - ::rtl::OUString aCommand; + OUString aToolbarName; + OUString aCommand; ToolBox* pToolBox = getToolboxPtr( ((VclWindowEvent*)pEvent)->GetWindow() ); if ( pToolBox ) @@ -862,10 +862,10 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent ) ToolBox* pToolBox = getToolboxPtr( ((VclWindowEvent*)pEvent)->GetWindow() ); if ( pToolBox ) { - ::rtl::OUString aToolbarName = retrieveToolbarNameFromHelpURL( pToolBox ); + OUString aToolbarName = retrieveToolbarNameFromHelpURL( pToolBox ); if ( !aToolbarName.isEmpty() ) { - ::rtl::OUStringBuffer aBuf(100); + OUStringBuffer aBuf(100); aBuf.appendAscii( "private:resource/toolbar/" ); aBuf.append( aToolbarName ); @@ -948,7 +948,7 @@ void ToolbarLayoutManager::setDockingAreaOffsets( const ::Rectangle aOffsets ) m_bLayoutDirty = true; } -rtl::OUString ToolbarLayoutManager::implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const +OUString ToolbarLayoutManager::implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const { String aAddonGenericTitle; @@ -958,7 +958,7 @@ rtl::OUString ToolbarLayoutManager::implts_generateGenericAddonToolbarTitle( sal String aNumStr = rI18nHelper.GetNum( nNumber, 0, sal_False, sal_False ); aAddonGenericTitle.SearchAndReplaceAscii( "%num%", aNumStr ); - return rtl::OUString( aAddonGenericTitle ); + return OUString( aAddonGenericTitle ); } void ToolbarLayoutManager::implts_createAddonsToolBars() @@ -978,16 +978,16 @@ void ToolbarLayoutManager::implts_createAddonsToolBars() uno::Reference< ui::XUIElement > xUIElement; sal_uInt32 nCount = m_pAddonOptions->GetAddonsToolBarCount(); - ::rtl::OUString aAddonsToolBarStaticName( m_aFullAddonTbxPrefix ); - ::rtl::OUString aElementType( RTL_CONSTASCII_USTRINGPARAM( "toolbar" )); + OUString aAddonsToolBarStaticName( m_aFullAddonTbxPrefix ); + OUString aElementType( "toolbar" ); uno::Sequence< beans::PropertyValue > aPropSeq( 2 ); - aPropSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); + aPropSeq[0].Name = OUString( "Frame" ); aPropSeq[0].Value <<= xFrame; - aPropSeq[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationData" )); + aPropSeq[1].Name = OUString( "ConfigurationData" ); for ( sal_uInt32 i = 0; i < nCount; i++ ) { - ::rtl::OUString aAddonToolBarName( aAddonsToolBarStaticName + m_pAddonOptions->GetAddonsToolbarResourceName(i) ); + OUString aAddonToolBarName( aAddonsToolBarStaticName + m_pAddonOptions->GetAddonsToolbarResourceName(i) ); aAddonToolBarData = m_pAddonOptions->GetAddonsToolBarPart( i ); aPropSeq[1].Value <<= aAddonToolBarData; @@ -1020,7 +1020,7 @@ void ToolbarLayoutManager::implts_createAddonsToolBars() } } - ::rtl::OUString aGenericAddonTitle = implts_generateGenericAddonToolbarTitle( i+1 ); + OUString aGenericAddonTitle = implts_generateGenericAddonToolbarTitle( i+1 ); if ( !aElement.m_aName.isEmpty() ) { @@ -1119,17 +1119,17 @@ void ToolbarLayoutManager::implts_createNonContextSensitiveToolBars() if (isPreviewFrame()) return; - std::vector< rtl::OUString > aMakeVisibleToolbars; + std::vector< OUString > aMakeVisibleToolbars; try { - uno::Sequence< ::rtl::OUString > aToolbarNames = xPersistentWindowState->getElementNames(); + uno::Sequence< OUString > aToolbarNames = xPersistentWindowState->getElementNames(); if ( aToolbarNames.getLength() > 0 ) { - ::rtl::OUString aElementType; - ::rtl::OUString aElementName; - ::rtl::OUString aName; + OUString aElementType; + OUString aElementName; + OUString aName; uno::Reference< ui::XUIElement > xUIElement; aMakeVisibleToolbars.reserve(aToolbarNames.getLength()); @@ -1137,7 +1137,7 @@ void ToolbarLayoutManager::implts_createNonContextSensitiveToolBars() /* SAFE AREA ----------------------------------------------------------------------------------------------- */ WriteGuard aWriteLock( m_aLock ); - const rtl::OUString* pTbNames = aToolbarNames.getConstArray(); + const OUString* pTbNames = aToolbarNames.getConstArray(); for ( sal_Int32 i = 0; i < aToolbarNames.getLength(); i++ ) { aName = pTbNames[i]; @@ -1184,8 +1184,8 @@ void ToolbarLayoutManager::implts_createCustomToolBars( const uno::Sequence< uno for ( sal_Int32 i = 0; i < aTbxSeqSeq.getLength(); i++ ) { const uno::Sequence< beans::PropertyValue >& rTbxSeq = pTbxSeq[i]; - ::rtl::OUString aTbxResName; - ::rtl::OUString aTbxTitle; + OUString aTbxResName; + OUString aTbxTitle; for ( sal_Int32 j = 0; j < rTbxSeq.getLength(); j++ ) { if ( rTbxSeq[j].Name == "ResourceURL" ) @@ -1200,7 +1200,7 @@ void ToolbarLayoutManager::implts_createCustomToolBars( const uno::Sequence< uno } } -void ToolbarLayoutManager::implts_createCustomToolBar( const rtl::OUString& aTbxResName, const rtl::OUString& aTitle ) +void ToolbarLayoutManager::implts_createCustomToolBar( const OUString& aTbxResName, const OUString& aTitle ) { if ( !aTbxResName.isEmpty() ) { @@ -1289,7 +1289,7 @@ bool ToolbarLayoutManager::implts_isToolbarCreationActive() return m_bToolbarCreation; } -void ToolbarLayoutManager::implts_createToolBar( const ::rtl::OUString& aName, bool& bNotify, uno::Reference< ui::XUIElement >& rUIElement ) +void ToolbarLayoutManager::implts_createToolBar( const OUString& aName, bool& bNotify, uno::Reference< ui::XUIElement >& rUIElement ) { ReadGuard aReadLock( m_aLock ); uno::Reference< frame::XFrame > xFrame( m_xFrame ); @@ -1379,15 +1379,15 @@ void ToolbarLayoutManager::implts_createToolBar( const ::rtl::OUString& aName, b } } -uno::Reference< ui::XUIElement > ToolbarLayoutManager::implts_createElement( const ::rtl::OUString& aName ) +uno::Reference< ui::XUIElement > ToolbarLayoutManager::implts_createElement( const OUString& aName ) { uno::Reference< ui::XUIElement > xUIElement; ReadGuard aReadLock( m_aLock ); uno::Sequence< beans::PropertyValue > aPropSeq( 2 ); - aPropSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); + aPropSeq[0].Name = OUString( "Frame" ); aPropSeq[0].Value <<= m_xFrame; - aPropSeq[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" )); + aPropSeq[1].Name = OUString( "Persistent" ); aPropSeq[1].Value <<= true; uno::Reference< ui::XUIElementFactory > xUIElementFactory( m_xUIElementFactoryManager ); aReadLock.unlock(); @@ -1563,7 +1563,7 @@ void ToolbarLayoutManager::implts_destroyDockingAreaWindows() // persistence methods //--------------------------------------------------------------------------------------------------------- -sal_Bool ToolbarLayoutManager::implts_readWindowStateData( const rtl::OUString& aName, UIElement& rElementData ) +sal_Bool ToolbarLayoutManager::implts_readWindowStateData( const OUString& aName, UIElement& rElementData ) { WriteGuard aWriteLock( m_aLock ); uno::Reference< container::XNameAccess > xPersistentWindowState( m_xPersistentWindowState ); @@ -1710,7 +1710,7 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen try { // Check persistent flag of the user interface element - xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ))) >>= bPersistent; + xPropSet->getPropertyValue( OUString( "Persistent" )) >>= bPersistent; } catch (const beans::UnknownPropertyException&) { @@ -1727,29 +1727,29 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen { uno::Sequence< beans::PropertyValue > aWindowState( 8 ); - aWindowState[0].Name = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKED ); + aWindowState[0].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKED ); aWindowState[0].Value = ::uno::makeAny( sal_Bool( !rElementData.m_bFloating )); - aWindowState[1].Name = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_VISIBLE ); + aWindowState[1].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_VISIBLE ); aWindowState[1].Value = uno::makeAny( sal_Bool( rElementData.m_bVisible )); - aWindowState[2].Name = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKINGAREA ); + aWindowState[2].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKINGAREA ); aWindowState[2].Value = uno::makeAny( static_cast< ui::DockingArea >( rElementData.m_aDockedData.m_nDockedArea ) ); awt::Point aPos = rElementData.m_aDockedData.m_aPos; - aWindowState[3].Name = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKPOS ); + aWindowState[3].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKPOS ); aWindowState[3].Value <<= aPos; aPos = rElementData.m_aFloatingData.m_aPos; - aWindowState[4].Name = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_POS ); + aWindowState[4].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_POS ); aWindowState[4].Value <<= aPos; - aWindowState[5].Name = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_SIZE ); + aWindowState[5].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_SIZE ); aWindowState[5].Value <<= rElementData.m_aFloatingData.m_aSize; - aWindowState[6].Name = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_UINAME ); + aWindowState[6].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_UINAME ); aWindowState[6].Value = uno::makeAny( rElementData.m_aUIName ); - aWindowState[7].Name = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_LOCKED ); + aWindowState[7].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_LOCKED ); aWindowState[7].Value = uno::makeAny( rElementData.m_aDockedData.m_bLocked ); - ::rtl::OUString aName = rElementData.m_aName; + OUString aName = rElementData.m_aName; if ( xPersistentWindowState->hasByName( aName )) { uno::Reference< container::XNameReplace > xReplace( xPersistentWindowState, uno::UNO_QUERY ); @@ -1776,7 +1776,7 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen LOOKUP PART FOR TOOLBARS ******************************************************************************/ -UIElement& ToolbarLayoutManager::impl_findToolbar( const rtl::OUString& aName ) +UIElement& ToolbarLayoutManager::impl_findToolbar( const OUString& aName ) { static UIElement aEmptyElement; UIElementVector::iterator pIter; @@ -1791,7 +1791,7 @@ UIElement& ToolbarLayoutManager::impl_findToolbar( const rtl::OUString& aName ) return aEmptyElement; } -UIElement ToolbarLayoutManager::implts_findToolbar( const rtl::OUString& aName ) +UIElement ToolbarLayoutManager::implts_findToolbar( const OUString& aName ) { ReadGuard aReadLock( m_aLock ); UIElement aElement = impl_findToolbar( aName ); @@ -1822,7 +1822,7 @@ UIElement ToolbarLayoutManager::implts_findToolbar( const uno::Reference< uno::X return aToolbar; } -uno::Reference< awt::XWindow > ToolbarLayoutManager::implts_getXWindow( const ::rtl::OUString& aName ) +uno::Reference< awt::XWindow > ToolbarLayoutManager::implts_getXWindow( const OUString& aName ) { UIElementVector::iterator pIter; uno::Reference< awt::XWindow > xWindow; @@ -1840,7 +1840,7 @@ uno::Reference< awt::XWindow > ToolbarLayoutManager::implts_getXWindow( const :: return xWindow; } -Window* ToolbarLayoutManager::implts_getWindow( const ::rtl::OUString& aName ) +Window* ToolbarLayoutManager::implts_getWindow( const OUString& aName ) { uno::Reference< awt::XWindow > xWindow = implts_getXWindow( aName ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -2284,7 +2284,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, - const rtl::OUString& rExcludeElementName ) + const OUString& rExcludeElementName ) { ::Rectangle aWinRect; @@ -2332,7 +2332,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D ui::DockingArea eDockingArea, sal_Int32 nRowCol, const ::Rectangle& rDockedElementRect, - const ::rtl::OUString& rMovedElementName, + const OUString& rMovedElementName, const ::Rectangle& rMovedElementRect ) { SingleRowColumnWindowData aRowColumnWindowData; @@ -3285,7 +3285,7 @@ void ToolbarLayoutManager::implts_renumberRowColumnData( { try { - uno::Sequence< ::rtl::OUString > aWindowElements = xPersistentWindowState->getElementNames(); + uno::Sequence< OUString > aWindowElements = xPersistentWindowState->getElementNames(); for ( sal_Int32 i = 0; i < aWindowElements.getLength(); i++ ) { if ( rUIElement.m_aName != aWindowElements[i] ) @@ -3909,7 +3909,7 @@ throw (uno::RuntimeException) void SAL_CALL ToolbarLayoutManager::closed( const lang::EventObject& e ) throw (uno::RuntimeException) { - rtl::OUString aName; + OUString aName; UIElement aUIElement; UIElementVector::iterator pIter; @@ -3969,7 +3969,7 @@ throw (uno::RuntimeException) uno::Reference< ui::XUIElementSettings > xElementSettings( aUIElement.m_xUIElement, uno::UNO_QUERY ); if ( xElementSettings.is() ) { - ::rtl::OUString aConfigSourcePropName( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" )); + OUString aConfigSourcePropName( "ConfigurationSource" ); uno::Reference< beans::XPropertySet > xPropSet( xElementSettings, uno::UNO_QUERY ); if ( xPropSet.is() ) { @@ -3980,8 +3980,8 @@ throw (uno::RuntimeException) } else { - ::rtl::OUString aElementType; - ::rtl::OUString aElementName; + OUString aElementType; + OUString aElementName; parseResourceURL( rEvent.ResourceURL, aElementType, aElementName ); if ( aElementName.indexOf( m_aCustomTbxPrefix ) != -1 ) { @@ -3990,7 +3990,7 @@ throw (uno::RuntimeException) uno::Reference< ui::XUIElement > xUIElement = getToolbar( rEvent.ResourceURL ); if ( xUIElement.is() ) { - ::rtl::OUString aUIName; + OUString aUIName; uno::Reference< ui::XUIConfigurationManager > xCfgMgr; uno::Reference< beans::XPropertySet > xPropSet; @@ -4000,7 +4000,7 @@ throw (uno::RuntimeException) xPropSet = uno::Reference< beans::XPropertySet >( xCfgMgr->getSettings( rEvent.ResourceURL, sal_False ), uno::UNO_QUERY ); if ( xPropSet.is() ) - xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))) >>= aUIName; + xPropSet->getPropertyValue( OUString( "UIName" )) >>= aUIName; } catch (const container::NoSuchElementException&) { @@ -4039,7 +4039,7 @@ throw (uno::RuntimeException) if ( xElementSettings.is() ) { bool bNoSettings( false ); - ::rtl::OUString aConfigSourcePropName( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" )); + OUString aConfigSourcePropName( "ConfigurationSource" ); uno::Reference< uno::XInterface > xElementCfgMgr; uno::Reference< beans::XPropertySet > xPropSet( xElementSettings, uno::UNO_QUERY ); @@ -4081,7 +4081,7 @@ throw (uno::RuntimeException) uno::Reference< ui::XUIElementSettings > xElementSettings( aUIElement.m_xUIElement, uno::UNO_QUERY ); if ( xElementSettings.is() ) { - ::rtl::OUString aConfigSourcePropName( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" )); + OUString aConfigSourcePropName( "ConfigurationSource" ); uno::Reference< uno::XInterface > xElementCfgMgr; uno::Reference< beans::XPropertySet > xPropSet( xElementSettings, uno::UNO_QUERY ); @@ -4108,7 +4108,7 @@ throw (uno::RuntimeException) } } -uno::Reference< ui::XUIElement > ToolbarLayoutManager::getToolbar( const ::rtl::OUString& aName ) +uno::Reference< ui::XUIElement > ToolbarLayoutManager::getToolbar( const OUString& aName ) { return implts_findToolbar( aName ).m_xUIElement; } @@ -4136,7 +4136,7 @@ uno::Sequence< uno::Reference< ui::XUIElement > > ToolbarLayoutManager::getToolb return aSeq; } -bool ToolbarLayoutManager::floatToolbar( const ::rtl::OUString& rResourceURL ) +bool ToolbarLayoutManager::floatToolbar( const OUString& rResourceURL ) { UIElement aUIElement = implts_findToolbar( rResourceURL ); if ( aUIElement.m_xUIElement.is() ) @@ -4163,7 +4163,7 @@ bool ToolbarLayoutManager::floatToolbar( const ::rtl::OUString& rResourceURL ) return false; } -bool ToolbarLayoutManager::lockToolbar( const ::rtl::OUString& rResourceURL ) +bool ToolbarLayoutManager::lockToolbar( const OUString& rResourceURL ) { UIElement aUIElement = implts_findToolbar( rResourceURL ); if ( aUIElement.m_xUIElement.is() ) @@ -4190,7 +4190,7 @@ bool ToolbarLayoutManager::lockToolbar( const ::rtl::OUString& rResourceURL ) return false; } -bool ToolbarLayoutManager::unlockToolbar( const ::rtl::OUString& rResourceURL ) +bool ToolbarLayoutManager::unlockToolbar( const OUString& rResourceURL ) { UIElement aUIElement = implts_findToolbar( rResourceURL ); if ( aUIElement.m_xUIElement.is() ) @@ -4217,30 +4217,30 @@ bool ToolbarLayoutManager::unlockToolbar( const ::rtl::OUString& rResourceURL ) return false; } -bool ToolbarLayoutManager::isToolbarVisible( const ::rtl::OUString& rResourceURL ) +bool ToolbarLayoutManager::isToolbarVisible( const OUString& rResourceURL ) { uno::Reference< awt::XWindow2 > xWindow2( implts_getXWindow( rResourceURL ), uno::UNO_QUERY ); return ( xWindow2.is() && xWindow2->isVisible() ); } -bool ToolbarLayoutManager::isToolbarFloating( const ::rtl::OUString& rResourceURL ) +bool ToolbarLayoutManager::isToolbarFloating( const OUString& rResourceURL ) { uno::Reference< awt::XDockableWindow > xDockWindow( implts_getXWindow( rResourceURL ), uno::UNO_QUERY ); return ( xDockWindow.is() && xDockWindow->isFloating() ); } -bool ToolbarLayoutManager::isToolbarDocked( const ::rtl::OUString& rResourceURL ) +bool ToolbarLayoutManager::isToolbarDocked( const OUString& rResourceURL ) { return !isToolbarFloating( rResourceURL ); } -bool ToolbarLayoutManager::isToolbarLocked( const ::rtl::OUString& rResourceURL ) +bool ToolbarLayoutManager::isToolbarLocked( const OUString& rResourceURL ) { uno::Reference< awt::XDockableWindow > xDockWindow( implts_getXWindow( rResourceURL ), uno::UNO_QUERY ); return ( xDockWindow.is() && xDockWindow->isLocked() ); } -awt::Size ToolbarLayoutManager::getToolbarSize( const ::rtl::OUString& rResourceURL ) +awt::Size ToolbarLayoutManager::getToolbarSize( const OUString& rResourceURL ) { Window* pWindow = implts_getWindow( rResourceURL ); @@ -4257,7 +4257,7 @@ awt::Size ToolbarLayoutManager::getToolbarSize( const ::rtl::OUString& rResource return awt::Size(); } -awt::Point ToolbarLayoutManager::getToolbarPos( const ::rtl::OUString& rResourceURL ) +awt::Point ToolbarLayoutManager::getToolbarPos( const OUString& rResourceURL ) { awt::Point aPos; UIElement aUIElement = implts_findToolbar( rResourceURL ); @@ -4278,7 +4278,7 @@ awt::Point ToolbarLayoutManager::getToolbarPos( const ::rtl::OUString& rResource return aPos; } -void ToolbarLayoutManager::setToolbarSize( const ::rtl::OUString& rResourceURL, const awt::Size& aSize ) +void ToolbarLayoutManager::setToolbarSize( const OUString& rResourceURL, const awt::Size& aSize ) { uno::Reference< awt::XWindow2 > xWindow( implts_getXWindow( rResourceURL ), uno::UNO_QUERY ); uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY ); @@ -4294,7 +4294,7 @@ void ToolbarLayoutManager::setToolbarSize( const ::rtl::OUString& rResourceURL, } } -void ToolbarLayoutManager::setToolbarPos( const ::rtl::OUString& rResourceURL, const awt::Point& aPos ) +void ToolbarLayoutManager::setToolbarPos( const OUString& rResourceURL, const awt::Point& aPos ) { uno::Reference< awt::XWindow > xWindow( implts_getXWindow( rResourceURL )); uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY ); @@ -4310,7 +4310,7 @@ void ToolbarLayoutManager::setToolbarPos( const ::rtl::OUString& rResourceURL, c } } -void ToolbarLayoutManager::setToolbarPosSize( const ::rtl::OUString& rResourceURL, const awt::Point& aPos, const awt::Size& aSize ) +void ToolbarLayoutManager::setToolbarPosSize( const OUString& rResourceURL, const awt::Point& aPos, const awt::Size& aSize ) { setToolbarPos( rResourceURL, aPos ); setToolbarSize( rResourceURL, aSize ); diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 819ec5e3d6ee..5e2ca264767a 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -122,7 +122,7 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper1< ::com::sun::star virtual ~RecentFilesStringLength() {} // XStringWidth - sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& aString ) + sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) throw (::com::sun::star::uno::RuntimeException) { return aString.getLength(); @@ -160,16 +160,16 @@ BackingWindow::BackingWindow( Window* i_pParent ) : Reference<lang::XMultiServiceFactory> xConfig = configuration::theDefaultProvider::get( comphelper::getProcessComponentContext() ); Sequence<Any> args(1); PropertyValue val( - rtl::OUString( "nodepath" ), + OUString( "nodepath" ), 0, - Any(rtl::OUString( "/org.openoffice.Office.Common/Help/StartCenter")), + Any(OUString( "/org.openoffice.Office.Common/Help/StartCenter")), PropertyState_DIRECT_VALUE); args.getArray()[0] <<= val; Reference<container::XNameAccess> xNameAccess(xConfig->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,args), UNO_QUERY); if( xNameAccess.is() ) { //throws css::container::NoSuchElementException, css::lang::WrappedTargetException - Any value( xNameAccess->getByName(rtl::OUString("StartCenterHideExternalLinks")) ); + Any value( xNameAccess->getByName(OUString("StartCenterHideExternalLinks")) ); mnHideExternalLinks = value.get<sal_Int32>(); } } @@ -298,7 +298,7 @@ void BackingWindow::prepareRecentFileMenu() for ( sal_Int32 i = 0; i < nPickListMenuItems; i++ ) { Sequence< PropertyValue >& rPickListEntry = aHistoryList[i]; - rtl::OUString aURL, aFilter, aFilterOpt, aTitle; + OUString aURL, aFilter, aFilterOpt, aTitle; for ( sal_Int32 j = 0; j < rPickListEntry.getLength(); j++ ) { @@ -328,27 +328,27 @@ void BackingWindow::prepareRecentFileMenu() rArgsList.realloc( nArgs ); nArgs--; - rArgsList[nArgs].Name = rtl::OUString( "FilterName" ); + rArgsList[nArgs].Name = OUString( "FilterName" ); rArgsList[nArgs].Value = makeAny( aFilter ); if( !aFilterOpt.isEmpty() ) { nArgs--; - rArgsList[nArgs].Name = rtl::OUString( "FilterOptions" ); + rArgsList[nArgs].Name = OUString( "FilterOptions" ); rArgsList[nArgs].Value = makeAny( aFilterOpt ); } // documents in the picklist will never be opened as templates nArgs--; - rArgsList[nArgs].Name = rtl::OUString( "AsTemplate" ); + rArgsList[nArgs].Name = OUString( "AsTemplate" ); rArgsList[nArgs].Value = makeAny( (sal_Bool) sal_False ); nArgs--; - rArgsList[nArgs].Name = rtl::OUString( "Referer" ); - rArgsList[nArgs].Value = makeAny( rtl::OUString( "private:user" ) ); + rArgsList[nArgs].Name = OUString( "Referer" ); + rArgsList[nArgs].Value = makeAny( OUString( "private:user" ) ); // and finally create an entry in the popupmenu - rtl::OUString aMenuTitle; + OUString aMenuTitle; INetURLObject aURLObj( aURL ); if ( aURLObj.GetProtocol() == INET_PROT_FILE ) @@ -357,8 +357,8 @@ void BackingWindow::prepareRecentFileMenu() // path and abbreviate it with a special function: String aFileSystemPath( aURLObj.getFSysPath( INetURLObject::FSYS_DETECT ) ); - rtl::OUString aSystemPath( aFileSystemPath ); - rtl::OUString aCompactedSystemPath; + OUString aSystemPath( aFileSystemPath ); + OUString aCompactedSystemPath; oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL ); if ( !nError ) @@ -372,7 +372,7 @@ void BackingWindow::prepareRecentFileMenu() Reference< util::XStringWidth > xStringLength( new RecentFilesStringLength() ); aMenuTitle = aURLObj.getAbbreviated( xStringLength, 46, INetURLObject::DECODE_UNAMBIGUOUS ); } - rtl::OUStringBuffer aBuf( aMenuTitle.getLength() + 5 ); + OUStringBuffer aBuf( aMenuTitle.getLength() + 5 ); if( i < 9 ) { aBuf.append( sal_Unicode( '~' ) ); @@ -492,17 +492,17 @@ void BackingWindow::initControls() // collect the URLs of the entries in the File/New menu SvtModuleOptions aModuleOptions; - std::set< rtl::OUString > aFileNewAppsAvailable; + std::set< OUString > aFileNewAppsAvailable; SvtDynamicMenuOptions aOpt; Sequence < Sequence < PropertyValue > > aNewMenu = aOpt.GetMenu( E_NEWMENU ); - const rtl::OUString sURLKey( "URL" ); + const OUString sURLKey( "URL" ); const Sequence< PropertyValue >* pNewMenu = aNewMenu.getConstArray(); const Sequence< PropertyValue >* pNewMenuEnd = aNewMenu.getConstArray() + aNewMenu.getLength(); for ( ; pNewMenu != pNewMenuEnd; ++pNewMenu ) { comphelper::SequenceAsHashMap aEntryItems( *pNewMenu ); - rtl::OUString sURL( aEntryItems.getUnpackedValueOrDefault( sURLKey, rtl::OUString() ) ); + OUString sURL( aEntryItems.getUnpackedValueOrDefault( sURLKey, OUString() ) ); if ( !sURL.isEmpty() ) aFileNewAppsAvailable.insert( sURL ); } @@ -622,14 +622,14 @@ void BackingWindow::loadImage( const ResId& i_rId, PushButton& i_rButton ) void BackingWindow::layoutButton( const char* i_pURL, int nColumn, int i_nExtraWidth, - const std::set<rtl::OUString>& i_rURLS, + const std::set<OUString>& i_rURLS, SvtModuleOptions& i_rOpt, SvtModuleOptions::EModule i_eMod, PushButton& i_rBtn, MnemonicGenerator& i_rMnemns, const String& i_rStr ) { - rtl::OUString aURL( i_pURL ? rtl::OUString::createFromAscii( i_pURL ) : rtl::OUString() ); + OUString aURL( i_pURL ? OUString::createFromAscii( i_pURL ) : OUString() ); // setup button i_rBtn.SetPaintTransparent( sal_True ); i_rBtn.SetClickHdl( LINK( this, BackingWindow, ClickHdl ) ); @@ -880,24 +880,24 @@ IMPL_LINK_NOARG(BackingWindow, ToolboxHdl) Reference<lang::XMultiServiceFactory> xConfig = configuration::theDefaultProvider::get( comphelper::getProcessComponentContext() ); Sequence<Any> args(1); PropertyValue val( - rtl::OUString( "nodepath" ), + OUString( "nodepath" ), 0, - Any(rtl::OUString::createFromAscii(pNodePath)), + Any(OUString::createFromAscii(pNodePath)), PropertyState_DIRECT_VALUE); args.getArray()[0] <<= val; Reference<container::XNameAccess> xNameAccess(xConfig->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,args), UNO_QUERY); if( xNameAccess.is() ) { - rtl::OUString sURL; + OUString sURL; //throws css::container::NoSuchElementException, css::lang::WrappedTargetException - Any value( xNameAccess->getByName(rtl::OUString::createFromAscii(pNode)) ); - sURL = value.get<rtl::OUString> (); + Any value( xNameAccess->getByName(OUString::createFromAscii(pNode)) ); + sURL = value.get<OUString> (); localizeWebserviceURI(sURL); Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( com::sun::star::system::SystemShellExecute::create(comphelper::getProcessComponentContext())); //throws css::lang::IllegalArgumentException, css::system::SystemShellExecuteException - xSystemShellExecute->execute( sURL, rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); + xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); } } catch (const Exception&) @@ -912,27 +912,27 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) { // dispatch the appropriate URL and end the dialog if( pButton == &maWriterButton ) - dispatchURL( rtl::OUString( WRITER_URL ) ); + dispatchURL( OUString( WRITER_URL ) ); else if( pButton == &maCalcButton ) - dispatchURL( rtl::OUString( CALC_URL ) ); + dispatchURL( OUString( CALC_URL ) ); else if( pButton == &maImpressButton ) - dispatchURL( rtl::OUString( IMPRESS_WIZARD_URL ) ); + dispatchURL( OUString( IMPRESS_WIZARD_URL ) ); else if( pButton == &maDrawButton ) - dispatchURL( rtl::OUString( DRAW_URL ) ); + dispatchURL( OUString( DRAW_URL ) ); else if( pButton == &maDBButton ) - dispatchURL( rtl::OUString( BASE_URL ) ); + dispatchURL( OUString( BASE_URL ) ); else if( pButton == &maMathButton ) - dispatchURL( rtl::OUString( MATH_URL ) ); + dispatchURL( OUString( MATH_URL ) ); else if( pButton == &maOpenButton ) { Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY ); Sequence< com::sun::star::beans::PropertyValue > aArgs(1); PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = rtl::OUString("Referer"); - pArg[0].Value <<= rtl::OUString("private:user"); + pArg[0].Name = OUString("Referer"); + pArg[0].Value <<= OUString("private:user"); - dispatchURL( rtl::OUString( OPEN_URL ), rtl::OUString(), xFrame, aArgs ); + dispatchURL( OUString( OPEN_URL ), OUString(), xFrame, aArgs ); } else if( pButton == &maTemplateButton ) { @@ -940,10 +940,10 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) Sequence< com::sun::star::beans::PropertyValue > aArgs(1); PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = rtl::OUString("Referer"); - pArg[0].Value <<= rtl::OUString("private:user"); + pArg[0].Name = OUString("Referer"); + pArg[0].Value <<= OUString("private:user"); - dispatchURL( rtl::OUString( TEMPLATE_URL ), rtl::OUString(), xFrame, aArgs ); + dispatchURL( OUString( TEMPLATE_URL ), OUString(), xFrame, aArgs ); } return 0; } @@ -956,7 +956,7 @@ IMPL_LINK( BackingWindow, SelectHdl, Button*, pButton ) if( nItem >= 0 && nItem < sal_Int32(maRecentFiles.size()) ) { Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY ); - dispatchURL( maRecentFiles[nItem].aTargetURL, rtl::OUString(), xFrame, maRecentFiles[nItem].aArgSeq ); + dispatchURL( maRecentFiles[nItem].aTargetURL, OUString(), xFrame, maRecentFiles[nItem].aArgSeq ); } } return 0; @@ -1003,8 +1003,8 @@ static long implDispatchDelayed( void*, void* pArg ) return 0; } -void BackingWindow::dispatchURL( const rtl::OUString& i_rURL, - const rtl::OUString& rTarget, +void BackingWindow::dispatchURL( const OUString& i_rURL, + const OUString& rTarget, const Reference< XDispatchProvider >& i_xProv, const Sequence< PropertyValue >& i_rArgs ) { diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index a015114f96d6..6f52a62bebc7 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -47,8 +47,8 @@ #include <fwkdllapi.h> -#define CFGPROP_USERPATHS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UserPaths")) -#define CFGPROP_WRITEPATH rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WritePath")) +#define CFGPROP_USERPATHS OUString("UserPaths") +#define CFGPROP_WRITEPATH OUString("WritePath") /* 0 : old style "Template" string using ";" as seperator @@ -57,9 +57,9 @@ 3 : write path "Template_write" string */ -#define POSTFIX_INTERNAL_PATHS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_internal")) -#define POSTFIX_USER_PATHS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_user")) -#define POSTFIX_WRITE_PATH rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_writable")) +#define POSTFIX_INTERNAL_PATHS OUString("_internal") +#define POSTFIX_USER_PATHS OUString("_user") +#define POSTFIX_WRITE_PATH OUString("_writable") const sal_Int32 IDGROUP_OLDSTYLE = 0; const sal_Int32 IDGROUP_INTERNAL_PATHS = 1; @@ -162,10 +162,10 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven { const css::util::ElementChange& aChange = aEvent.Changes[i]; - ::rtl::OUString sChanged; + OUString sChanged; aChange.Accessor >>= sChanged; - ::rtl::OUString sPath = ::utl::extractFirstFromConfigurationPath(sChanged); + OUString sPath = ::utl::extractFirstFromConfigurationPath(sChanged); if (!sPath.isEmpty()) { PathSettings::EChangeOp eOp = impl_updatePath(sPath, sal_True); @@ -204,12 +204,12 @@ void PathSettings::impl_readAll() { // TODO think about me css::uno::Reference< css::container::XNameAccess > xCfg = fa_getCfgNew(); - css::uno::Sequence< ::rtl::OUString > lPaths = xCfg->getElementNames(); + css::uno::Sequence< OUString > lPaths = xCfg->getElementNames(); sal_Int32 c = lPaths.getLength(); for (sal_Int32 i = 0; i < c; ++i) { - const ::rtl::OUString& sPath = lPaths[i]; + const OUString& sPath = lPaths[i]; impl_updatePath(sPath, sal_False); } } @@ -222,7 +222,7 @@ void PathSettings::impl_readAll() //----------------------------------------------------------------------------- // NO substitution here ! It's done outside ... -OUStringList PathSettings::impl_readOldFormat(const ::rtl::OUString& sPath) +OUStringList PathSettings::impl_readOldFormat(const OUString& sPath) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::impl_readOldFormat" ); css::uno::Reference< css::container::XNameAccess > xCfg( fa_getCfgOld() ); @@ -232,8 +232,8 @@ OUStringList PathSettings::impl_readOldFormat(const ::rtl::OUString& sPath) { css::uno::Any aVal( xCfg->getByName(sPath) ); - ::rtl::OUString sStringVal; - css::uno::Sequence< ::rtl::OUString > lStringListVal; + OUString sStringVal; + css::uno::Sequence< OUString > lStringListVal; if (aVal >>= sStringVal) { @@ -250,10 +250,10 @@ OUStringList PathSettings::impl_readOldFormat(const ::rtl::OUString& sPath) //----------------------------------------------------------------------------- // NO substitution here ! It's done outside ... -PathSettings::PathInfo PathSettings::impl_readNewFormat(const ::rtl::OUString& sPath) +PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath) { - const ::rtl::OUString CFGPROP_INTERNALPATHS(RTL_CONSTASCII_USTRINGPARAM("InternalPaths")); - const ::rtl::OUString CFGPROP_ISSINGLEPATH(RTL_CONSTASCII_USTRINGPARAM("IsSinglePath")); + const OUString CFGPROP_INTERNALPATHS("InternalPaths"); + const OUString CFGPROP_ISSINGLEPATH("IsSinglePath"); css::uno::Reference< css::container::XNameAccess > xCfg = fa_getCfgNew(); @@ -351,7 +351,7 @@ void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, pIt != lOld.end() ; ++pIt ) { - const ::rtl::OUString& sOld = *pIt; + const OUString& sOld = *pIt; if (rPath.bIsSinglePath) { @@ -372,7 +372,7 @@ void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, } //----------------------------------------------------------------------------- -PathSettings::EChangeOp PathSettings::impl_updatePath(const ::rtl::OUString& sPath , +PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath , sal_Bool bNotifyListener) { // SAFE -> @@ -479,12 +479,12 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const ::rtl::OUString& sPa } //----------------------------------------------------------------------------- -css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const ::rtl::OUString& sPath) +css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const OUString& sPath) { - ::rtl::OUString sOldStyleProp = sPath; - ::rtl::OUString sInternalProp = sPath+POSTFIX_INTERNAL_PATHS; - ::rtl::OUString sUserProp = sPath+POSTFIX_USER_PATHS; - ::rtl::OUString sWriteProp = sPath+POSTFIX_WRITE_PATH; + OUString sOldStyleProp = sPath; + OUString sInternalProp = sPath+POSTFIX_INTERNAL_PATHS; + OUString sUserProp = sPath+POSTFIX_USER_PATHS; + OUString sWriteProp = sPath+POSTFIX_WRITE_PATH; // Attention: The default set of IDs is fix and must follow these schema. // Otherwhise the outside code ant work for new added properties. @@ -524,7 +524,7 @@ css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const ::rt //----------------------------------------------------------------------------- void PathSettings::impl_notifyPropListener( PathSettings::EChangeOp /*eOp*/ , - const ::rtl::OUString& sPath , + const OUString& sPath , const PathSettings::PathInfo* pPathOld, const PathSettings::PathInfo* pPathNew) { @@ -553,12 +553,12 @@ void PathSettings::impl_notifyPropListener( PathSettings::EChangeOp /*eOp*/ { if (pPathOld) { - ::rtl::OUString sVal = impl_convertPath2OldStyle(*pPathOld); + OUString sVal = impl_convertPath2OldStyle(*pPathOld); lOldVals[0] <<= sVal; } if (pPathNew) { - ::rtl::OUString sVal = impl_convertPath2OldStyle(*pPathNew); + OUString sVal = impl_convertPath2OldStyle(*pPathNew); lNewVals[0] <<= sVal; } } @@ -611,8 +611,8 @@ void PathSettings::impl_subst( OUStringList& pIt != lVals.end() ; ++pIt ) { - const ::rtl::OUString& sOld = *pIt; - ::rtl::OUString sNew ; + const OUString& sOld = *pIt; + OUString sNew ; if (bReSubst) sNew = xSubst->reSubstituteVariables(sOld); else @@ -637,7 +637,7 @@ void PathSettings::impl_subst(PathSettings::PathInfo& aPath , } //----------------------------------------------------------------------------- -::rtl::OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath) const +OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath) const { OUStringList::const_iterator pIt; OUStringList lTemp; @@ -659,7 +659,7 @@ void PathSettings::impl_subst(PathSettings::PathInfo& aPath , if (!rPath.sWritePath.isEmpty()) lTemp.push_back(rPath.sWritePath); - ::rtl::OUStringBuffer sPathVal(256); + OUStringBuffer sPathVal(256); for ( pIt = lTemp.begin(); pIt != lTemp.end() ; ) @@ -674,13 +674,13 @@ void PathSettings::impl_subst(PathSettings::PathInfo& aPath , } //----------------------------------------------------------------------------- -OUStringList PathSettings::impl_convertOldStyle2Path(const ::rtl::OUString& sOldStylePath) const +OUStringList PathSettings::impl_convertOldStyle2Path(const OUString& sOldStylePath) const { OUStringList lList; sal_Int32 nToken = 0; do { - ::rtl::OUString sToken = sOldStylePath.getToken(0, ';', nToken); + OUString sToken = sOldStylePath.getToken(0, ';', nToken); if (!sToken.isEmpty()) lList.push_back(sToken); } @@ -698,7 +698,7 @@ void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo& rPath, pIt != rPath.lInternalPaths.end() ; ++pIt ) { - const ::rtl::OUString& rItem = *pIt; + const OUString& rItem = *pIt; OUStringList::iterator pItem = lList.find(rItem); if (pItem != lList.end()) lList.erase(pItem); @@ -707,7 +707,7 @@ void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo& rPath, pIt != rPath.lUserPaths.end() ; ++pIt ) { - const ::rtl::OUString& rItem = *pIt; + const OUString& rItem = *pIt; OUStringList::iterator pItem = lList.find(rItem); if (pItem != lList.end()) lList.erase(pItem); @@ -739,7 +739,7 @@ void PathSettings::impl_rebuildPropertyDescriptor() pProp = &(m_lPropDesc[i]); pProp->Name = rPath.sPathName; pProp->Handle = i; - pProp->Type = ::getCppuType((::rtl::OUString*)0); + pProp->Type = ::getCppuType((OUString*)0); pProp->Attributes = css::beans::PropertyAttribute::BOUND; if (rPath.bIsReadonly) pProp->Attributes |= css::beans::PropertyAttribute::READONLY; @@ -748,7 +748,7 @@ void PathSettings::impl_rebuildPropertyDescriptor() pProp = &(m_lPropDesc[i]); pProp->Name = rPath.sPathName+POSTFIX_INTERNAL_PATHS; pProp->Handle = i; - pProp->Type = ::getCppuType((css::uno::Sequence< ::rtl::OUString >*)0); + pProp->Type = ::getCppuType((css::uno::Sequence< OUString >*)0); pProp->Attributes = css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY; ++i; @@ -756,7 +756,7 @@ void PathSettings::impl_rebuildPropertyDescriptor() pProp = &(m_lPropDesc[i]); pProp->Name = rPath.sPathName+POSTFIX_USER_PATHS; pProp->Handle = i; - pProp->Type = ::getCppuType((css::uno::Sequence< ::rtl::OUString >*)0); + pProp->Type = ::getCppuType((css::uno::Sequence< OUString >*)0); pProp->Attributes = css::beans::PropertyAttribute::BOUND; if (rPath.bIsReadonly) pProp->Attributes |= css::beans::PropertyAttribute::READONLY; @@ -765,7 +765,7 @@ void PathSettings::impl_rebuildPropertyDescriptor() pProp = &(m_lPropDesc[i]); pProp->Name = rPath.sPathName+POSTFIX_WRITE_PATH; pProp->Handle = i; - pProp->Type = ::getCppuType((::rtl::OUString*)0); + pProp->Type = ::getCppuType((OUString*)0); pProp->Attributes = css::beans::PropertyAttribute::BOUND; if (rPath.bIsReadonly) pProp->Attributes |= css::beans::PropertyAttribute::READONLY; @@ -792,7 +792,7 @@ css::uno::Any PathSettings::impl_getPathValue(sal_Int32 nID) const { case IDGROUP_OLDSTYLE : { - ::rtl::OUString sVal = impl_convertPath2OldStyle(*pPath); + OUString sVal = impl_convertPath2OldStyle(*pPath); aVal <<= sVal; } break; @@ -835,7 +835,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , { case IDGROUP_OLDSTYLE : { - ::rtl::OUString sVal; + OUString sVal; aVal >>= sVal; OUStringList lList = impl_convertOldStyle2Path(sVal); impl_subst(lList, fa_getSubstitution(), sal_False); @@ -849,7 +849,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , if ( !lList.empty() ) aChangePath.sWritePath = *(lList.begin()); else - aChangePath.sWritePath = ::rtl::OUString(); + aChangePath.sWritePath = OUString(); } else { @@ -868,7 +868,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , { if (aChangePath.bIsSinglePath) { - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("The path '" ); sMsg.append (aChangePath.sPathName); sMsg.appendAscii("' is defined as SINGLE_PATH. It's sub set of internal paths cant be set."); @@ -888,7 +888,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , { if (aChangePath.bIsSinglePath) { - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("The path '" ); sMsg.append (aChangePath.sPathName); sMsg.appendAscii("' is defined as SINGLE_PATH. It's sub set of internal paths cant be set."); @@ -906,7 +906,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , case IDGROUP_WRITE_PATH : { - ::rtl::OUString sVal; + OUString sVal; aVal >>= sVal; if (! impl_isValidPath(sVal)) throw css::lang::IllegalArgumentException(); @@ -934,7 +934,7 @@ sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const pIt != lPath.end() ; ++pIt ) { - const ::rtl::OUString& rVal = *pIt; + const OUString& rVal = *pIt; if (! impl_isValidPath(rVal)) return sal_False; } @@ -943,7 +943,7 @@ sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const } //----------------------------------------------------------------------------- -sal_Bool PathSettings::impl_isValidPath(const ::rtl::OUString& sPath) const +sal_Bool PathSettings::impl_isValidPath(const OUString& sPath) const { // allow empty path to reset a path. // idea by LLA to support empty paths @@ -956,7 +956,7 @@ sal_Bool PathSettings::impl_isValidPath(const ::rtl::OUString& sPath) const } //----------------------------------------------------------------------------- -::rtl::OUString impl_extractBaseFromPropName(const ::rtl::OUString& sPropName) +OUString impl_extractBaseFromPropName(const OUString& sPropName) { sal_Int32 i = sPropName.indexOf(POSTFIX_INTERNAL_PATHS); if (i > -1) @@ -981,7 +981,7 @@ PathSettings::PathInfo* PathSettings::impl_getPathAccess(sal_Int32 nHandle) return 0; const css::beans::Property& rProp = m_lPropDesc[nHandle]; - ::rtl::OUString sProp = impl_extractBaseFromPropName(rProp.Name); + OUString sProp = impl_extractBaseFromPropName(rProp.Name); PathSettings::PathHash::iterator rPath = m_lPaths.find(sProp); if (rPath != m_lPaths.end()) @@ -1001,7 +1001,7 @@ const PathSettings::PathInfo* PathSettings::impl_getPathAccessConst(sal_Int32 nH return 0; const css::beans::Property& rProp = m_lPropDesc[nHandle]; - ::rtl::OUString sProp = impl_extractBaseFromPropName(rProp.Name); + OUString sProp = impl_extractBaseFromPropName(rProp.Name); PathSettings::PathHash::const_iterator rPath = m_lPaths.find(sProp); if (rPath != m_lPaths.end()) @@ -1088,7 +1088,7 @@ css::uno::Reference< css::util::XStringSubstitution > PathSettings::fa_getSubsti //----------------------------------------------------------------------------- css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld() { - const ::rtl::OUString CFG_NODE_OLD(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Path/Current")); + const OUString CFG_NODE_OLD("org.openoffice.Office.Common/Path/Current"); // SAFE -> ReadGuard aReadLock(m_aLock); @@ -1118,7 +1118,7 @@ css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld() //----------------------------------------------------------------------------- css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgNew() { - const ::rtl::OUString CFG_NODE_NEW(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Paths/Paths")); + const OUString CFG_NODE_NEW("org.openoffice.Office.Paths/Paths"); // SAFE -> ReadGuard aReadLock(m_aLock); diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 4896af387322..baca72d3153a 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -198,7 +198,7 @@ static FixedVariable aFixedVarTable[] = // Implementation helper classes //_________________________________________________________________________________________________________________ -OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystemFromString( const rtl::OUString& aOSString ) +OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystemFromString( const OUString& aOSString ) { for ( int i = 0; i < OS_COUNT; i++ ) { @@ -209,7 +209,7 @@ OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystemFromString( cons return OS_UNKNOWN; } -EnvironmentType SubstitutePathVariables_Impl::GetEnvTypeFromString( const rtl::OUString& aEnvTypeString ) +EnvironmentType SubstitutePathVariables_Impl::GetEnvTypeFromString( const OUString& aEnvTypeString ) { for ( int i = 0; i < ET_COUNT; i++ ) { @@ -221,22 +221,22 @@ EnvironmentType SubstitutePathVariables_Impl::GetEnvTypeFromString( const rtl::O } SubstitutePathVariables_Impl::SubstitutePathVariables_Impl( const Link& aNotifyLink ) : - utl::ConfigItem( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Substitution" ))), + utl::ConfigItem( OUString( "Office.Substitution" )), m_bYPDomainRetrieved( false ), m_bDNSDomainRetrieved( false ), m_bNTDomainRetrieved( false ), m_bHostRetrieved( false ), m_bOSRetrieved( false ), m_aListenerNotify( aNotifyLink ), - m_aSharePointsNodeName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SharePoints" ))), - m_aDirPropertyName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/Directory" ))), - m_aEnvPropertyName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/Environment" ))), - m_aLevelSep( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ))) + m_aSharePointsNodeName( OUString( "SharePoints" )), + m_aDirPropertyName( OUString( "/Directory" )), + m_aEnvPropertyName( OUString( "/Environment" )), + m_aLevelSep( OUString( "/" )) { // Enable notification mechanism // We need it to get information about changes outside these class on our configuration branch - Sequence< rtl::OUString > aNotifySeq( 1 ); - aNotifySeq[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SharePoints" )); + Sequence< OUString > aNotifySeq( 1 ); + aNotifySeq[0] = OUString( "SharePoints" ); EnableNotification( aNotifySeq, sal_True ); } @@ -246,7 +246,7 @@ SubstitutePathVariables_Impl::~SubstitutePathVariables_Impl() void SubstitutePathVariables_Impl::GetSharePointsRules( SubstituteVariables& aSubstVarMap ) { - Sequence< rtl::OUString > aSharePointNames; + Sequence< OUString > aSharePointNames; ReadSharePointsFromConfiguration( aSharePointNames ); if ( aSharePointNames.getLength() > 0 ) @@ -256,8 +256,8 @@ void SubstitutePathVariables_Impl::GetSharePointsRules( SubstituteVariables& aSu // Read SharePoints container from configuration while ( nSharePoints < aSharePointNames.getLength() ) { - rtl::OUString aSharePointNodeName( m_aSharePointsNodeName ); - aSharePointNodeName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + OUString aSharePointNodeName( m_aSharePointsNodeName ); + aSharePointNodeName += OUString("/"); aSharePointNodeName += aSharePointNames[ nSharePoints ]; SubstituteRuleVector aRuleSet; @@ -280,7 +280,7 @@ void SubstitutePathVariables_Impl::GetSharePointsRules( SubstituteVariables& aSu } } -void SubstitutePathVariables_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& /*aPropertyNames*/ ) +void SubstitutePathVariables_Impl::Notify( const com::sun::star::uno::Sequence< OUString >& /*aPropertyNames*/ ) { // NOT implemented yet! } @@ -315,7 +315,7 @@ OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystem() return m_eOSType; } -const rtl::OUString& SubstitutePathVariables_Impl::GetYPDomainName() +const OUString& SubstitutePathVariables_Impl::GetYPDomainName() { if ( !m_bYPDomainRetrieved ) { @@ -326,15 +326,15 @@ const rtl::OUString& SubstitutePathVariables_Impl::GetYPDomainName() return m_aYPDomain; } -const rtl::OUString& SubstitutePathVariables_Impl::GetDNSDomainName() +const OUString& SubstitutePathVariables_Impl::GetDNSDomainName() { if ( !m_bDNSDomainRetrieved ) { - rtl::OUString aTemp; + OUString aTemp; osl::SocketAddr aSockAddr; oslSocketResult aResult; - rtl::OUString aHostName = GetHostName(); + OUString aHostName = GetHostName(); osl::SocketAddr::resolveHostname( aHostName, aSockAddr ); aTemp = aSockAddr.getHostname( &aResult ); @@ -343,7 +343,7 @@ const rtl::OUString& SubstitutePathVariables_Impl::GetDNSDomainName() if ( nIndex >= 0 && aTemp.getLength() > nIndex+1 ) m_aDNSDomain = aTemp.copy( nIndex+1 ).toAsciiLowerCase(); else - m_aDNSDomain = rtl::OUString(); + m_aDNSDomain = OUString(); m_bDNSDomainRetrieved = sal_True; } @@ -351,7 +351,7 @@ const rtl::OUString& SubstitutePathVariables_Impl::GetDNSDomainName() return m_aDNSDomain; } -const rtl::OUString& SubstitutePathVariables_Impl::GetNTDomainName() +const OUString& SubstitutePathVariables_Impl::GetNTDomainName() { if ( !m_bNTDomainRetrieved ) { @@ -362,7 +362,7 @@ const rtl::OUString& SubstitutePathVariables_Impl::GetNTDomainName() return m_aNTDomain; } -const rtl::OUString& SubstitutePathVariables_Impl::GetHostName() +const OUString& SubstitutePathVariables_Impl::GetHostName() { if (!m_bHostRetrieved) { @@ -394,8 +394,8 @@ bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector& aR { case ET_HOST: { - rtl::OUString aHost = GetHostName(); - rtl::OUString aHostStr; + OUString aHost = GetHostName(); + OUString aHostStr; aRule.aEnvValue >>= aHostStr; aHostStr = aHostStr.toAsciiLowerCase(); @@ -415,8 +415,8 @@ bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector& aR case ET_DNSDOMAIN: case ET_NTDOMAIN: { - rtl::OUString aDomain; - rtl::OUString aDomainStr; + OUString aDomain; + OUString aDomainStr; aRule.aEnvValue >>= aDomainStr; aDomainStr = aDomainStr.toAsciiLowerCase(); @@ -474,33 +474,33 @@ bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector& aR return bResult; } -void SubstitutePathVariables_Impl::ReadSharePointsFromConfiguration( Sequence< rtl::OUString >& aSharePointsSeq ) +void SubstitutePathVariables_Impl::ReadSharePointsFromConfiguration( Sequence< OUString >& aSharePointsSeq ) { //returns all the names of all share point nodes aSharePointsSeq = GetNodeNames( m_aSharePointsNodeName ); } void SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration( - const rtl::OUString& aSharePointName, - const rtl::OUString& aSharePointNodeName, + const OUString& aSharePointName, + const OUString& aSharePointNodeName, SubstituteRuleVector& rRuleSet ) { - Sequence< rtl::OUString > aSharePointMappingsNodeNames = GetNodeNames( aSharePointNodeName, utl::CONFIG_NAME_LOCAL_PATH ); + Sequence< OUString > aSharePointMappingsNodeNames = GetNodeNames( aSharePointNodeName, utl::CONFIG_NAME_LOCAL_PATH ); sal_Int32 nSharePointMapping = 0; while ( nSharePointMapping < aSharePointMappingsNodeNames.getLength() ) { - rtl::OUString aSharePointMapping( aSharePointNodeName ); + OUString aSharePointMapping( aSharePointNodeName ); aSharePointMapping += m_aLevelSep; aSharePointMapping += aSharePointMappingsNodeNames[ nSharePointMapping ]; // Read SharePointMapping - rtl::OUString aDirValue; - rtl::OUString aDirProperty( aSharePointMapping ); + OUString aDirValue; + OUString aDirProperty( aSharePointMapping ); aDirProperty += m_aDirPropertyName; // Read only the directory property - Sequence< rtl::OUString > aDirPropertySeq( 1 ); + Sequence< OUString > aDirPropertySeq( 1 ); aDirPropertySeq[0] = aDirProperty; Sequence< Any > aValueSeq = GetProperties( aDirPropertySeq ); @@ -508,24 +508,24 @@ void SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration( aValueSeq[0] >>= aDirValue; // Read the environment setting - rtl::OUString aEnvUsed; - rtl::OUString aEnvProperty( aSharePointMapping ); + OUString aEnvUsed; + OUString aEnvProperty( aSharePointMapping ); aEnvProperty += m_aEnvPropertyName; - Sequence< rtl::OUString > aEnvironmentVariable = GetNodeNames( aEnvProperty ); + Sequence< OUString > aEnvironmentVariable = GetNodeNames( aEnvProperty ); // Filter the property which has a value set - Sequence< rtl::OUString > aEnvUsedPropertySeq( aEnvironmentVariable.getLength() ); + Sequence< OUString > aEnvUsedPropertySeq( aEnvironmentVariable.getLength() ); - rtl::OUString aEnvUsePropNameTemplate( aEnvProperty ); + OUString aEnvUsePropNameTemplate( aEnvProperty ); aEnvUsePropNameTemplate += m_aLevelSep; for ( sal_Int32 nProperty = 0; nProperty < aEnvironmentVariable.getLength(); nProperty++ ) - aEnvUsedPropertySeq[nProperty] = rtl::OUString( aEnvUsePropNameTemplate + aEnvironmentVariable[nProperty] ); + aEnvUsedPropertySeq[nProperty] = OUString( aEnvUsePropNameTemplate + aEnvironmentVariable[nProperty] ); Sequence< Any > aEnvUsedValueSeq; aEnvUsedValueSeq = GetProperties( aEnvUsedPropertySeq ); - rtl::OUString aEnvUsedValue; + OUString aEnvUsedValue; for ( sal_Int32 nIndex = 0; nIndex < aEnvironmentVariable.getLength(); nIndex++ ) { if ( aEnvUsedValueSeq[nIndex] >>= aEnvUsedValue ) @@ -582,7 +582,7 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XMultiService for ( i = 0; i < PREDEFVAR_COUNT; i++ ) { // Store variable name into struct of predefined/fixed variables - m_aPreDefVars.m_FixedVarNames[i] = rtl::OUString::createFromAscii( aFixedVarTable[i].pVarName ); + m_aPreDefVars.m_FixedVarNames[i] = OUString::createFromAscii( aFixedVarTable[i].pVarName ); // Create hash map entry m_aPreDefVarMap.insert( VarNameToIndexMap::value_type( @@ -611,7 +611,7 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XMultiService for ( pIter = m_aSubstVarMap.begin(); pIter != m_aSubstVarMap.end(); ++pIter ) { ReSubstUserVarOrder aUserOrderVar; - rtl::OUStringBuffer aStrBuffer( pIter->second.aSubstVariable.getLength() ); + OUStringBuffer aStrBuffer( pIter->second.aSubstVariable.getLength() ); aStrBuffer.append( m_aVarStart ); aStrBuffer.append( pIter->second.aSubstVariable ); aStrBuffer.append( m_aVarEnd ); @@ -627,7 +627,7 @@ SubstitutePathVariables::~SubstitutePathVariables() } // XStringSubstitution -rtl::OUString SAL_CALL SubstitutePathVariables::substituteVariables( const ::rtl::OUString& aText, sal_Bool bSubstRequired ) +OUString SAL_CALL SubstitutePathVariables::substituteVariables( const OUString& aText, sal_Bool bSubstRequired ) throw ( NoSuchElementException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::substituteVariables" ); @@ -635,7 +635,7 @@ throw ( NoSuchElementException, RuntimeException ) return impl_substituteVariable( aText, bSubstRequired ); } -rtl::OUString SAL_CALL SubstitutePathVariables::reSubstituteVariables( const ::rtl::OUString& aText ) +OUString SAL_CALL SubstitutePathVariables::reSubstituteVariables( const OUString& aText ) throw ( RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::reSubstituteVariables" ); @@ -643,7 +643,7 @@ throw ( RuntimeException ) return impl_reSubstituteVariables( aText ); } -rtl::OUString SAL_CALL SubstitutePathVariables::getSubstituteVariableValue( const ::rtl::OUString& aVariable ) +OUString SAL_CALL SubstitutePathVariables::getSubstituteVariableValue( const OUString& aVariable ) throw ( NoSuchElementException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::getSubstituteVariableValue" ); @@ -663,11 +663,11 @@ IMPL_LINK_NOARG(SubstitutePathVariables, implts_ConfigurationNotify) return 0; } -rtl::OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const rtl::OUString& aOSLCompliantURL ) const +OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const OUString& aOSLCompliantURL ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::ConvertOSLtoUCBURL" ); - rtl::OUString aResult; - rtl::OUString aTemp; + OUString aResult; + OUString aTemp; osl::FileBase::getSystemPathFromFileURL( aOSLCompliantURL, aTemp ); utl::LocalFileHelper::ConvertPhysicalNameToURL( aTemp, aResult ); @@ -679,18 +679,18 @@ rtl::OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const rtl::OUString& return aResult; } -rtl::OUString SubstitutePathVariables::GetWorkPath() const +OUString SubstitutePathVariables::GetWorkPath() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetWorkPath" ); - rtl::OUString aWorkPath; + OUString aWorkPath; try { ::comphelper::ConfigurationHelper::readDirectKey( comphelper::getComponentContext(m_xServiceManager), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Paths")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Paths/Work")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WritePath")), + OUString("org.openoffice.Office.Paths"), + OUString("Paths/Work"), + OUString("WritePath"), ::comphelper::ConfigurationHelper::E_READONLY) >>= aWorkPath; } catch(const RuntimeException &) @@ -704,18 +704,18 @@ rtl::OUString SubstitutePathVariables::GetWorkPath() const return aWorkPath; } -rtl::OUString SubstitutePathVariables::GetWorkVariableValue() const +OUString SubstitutePathVariables::GetWorkVariableValue() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetWorkVariableValue" ); - ::rtl::OUString aWorkPath; + OUString aWorkPath; try { ::comphelper::ConfigurationHelper::readDirectKey( comphelper::getComponentContext(m_xServiceManager), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Paths")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Variables")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Work")), + OUString("org.openoffice.Office.Paths"), + OUString("Variables"), + OUString("Work"), ::comphelper::ConfigurationHelper::E_READONLY) >>= aWorkPath; } catch(const RuntimeException &) @@ -732,35 +732,35 @@ rtl::OUString SubstitutePathVariables::GetWorkVariableValue() const return ConvertOSLtoUCBURL( aWorkPath ); } -rtl::OUString SubstitutePathVariables::GetHomeVariableValue() const +OUString SubstitutePathVariables::GetHomeVariableValue() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetHomeVariableValue" ); osl::Security aSecurity; - rtl::OUString aHomePath; + OUString aHomePath; aSecurity.getHomeDir( aHomePath ); return ConvertOSLtoUCBURL( aHomePath ); } -rtl::OUString SubstitutePathVariables::GetPathVariableValue() const +OUString SubstitutePathVariables::GetPathVariableValue() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetPathVariableValue" ); - rtl::OUString aRetStr; + OUString aRetStr; const char* pEnv = getenv( "PATH" ); if ( pEnv ) { const int PATH_EXTEND_FACTOR = 120; - rtl::OUString aTmp; - rtl::OUString aPathList( pEnv, strlen( pEnv ), osl_getThreadTextEncoding() ); - rtl::OUStringBuffer aPathStrBuffer( aPathList.getLength() * PATH_EXTEND_FACTOR / 100 ); + OUString aTmp; + OUString aPathList( pEnv, strlen( pEnv ), osl_getThreadTextEncoding() ); + OUStringBuffer aPathStrBuffer( aPathList.getLength() * PATH_EXTEND_FACTOR / 100 ); bool bAppendSep = false; sal_Int32 nToken = 0; do { - ::rtl::OUString sToken = aPathList.getToken(0, SAL_PATHSEPARATOR, nToken); + OUString sToken = aPathList.getToken(0, SAL_PATHSEPARATOR, nToken); if (!sToken.isEmpty()) { osl::FileBase::getFileURLFromSystemPath( sToken, aTmp ); @@ -778,18 +778,18 @@ rtl::OUString SubstitutePathVariables::GetPathVariableValue() const return aRetStr; } -rtl::OUString SubstitutePathVariables::impl_substituteVariable( const ::rtl::OUString& rText, bool bSubstRequired ) +OUString SubstitutePathVariables::impl_substituteVariable( const OUString& rText, bool bSubstRequired ) throw ( NoSuchElementException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::impl_substituteVariable" ); // This is maximal recursive depth supported! const sal_Int32 nMaxRecursiveDepth = 8; - rtl::OUString aWorkText = rText; - rtl::OUString aResult; + OUString aWorkText = rText; + OUString aResult; // Use vector with strings to detect endless recursions! - std::vector< rtl::OUString > aEndlessRecursiveDetector; + std::vector< OUString > aEndlessRecursiveDetector; // Search for first occure of "$(...". sal_Int32 nDepth = 0; @@ -817,9 +817,9 @@ throw ( NoSuchElementException, RuntimeException ) { // YES; Get the next variable for replace. sal_Int32 nReplaceLength = 0; - rtl::OUString aReplacement; - rtl::OUString aSubString = aWorkText.copy( nPosition, nLength ); - rtl::OUString aSubVarString; + OUString aReplacement; + OUString aSubString = aWorkText.copy( nPosition, nLength ); + OUString aSubVarString; // Path variables are not case sensitive! aSubVarString = aSubString.toAsciiLowerCase(); @@ -856,7 +856,7 @@ throw ( NoSuchElementException, RuntimeException ) else { // Extract the variable name and try to find in the user defined variable set - rtl::OUString aVarName = aSubString.copy( 2, nLength-3 ); + OUString aVarName = aSubString.copy( 2, nLength-3 ); SubstituteVariables::const_iterator pIter = m_aSubstVarMap.find( aVarName ); if ( pIter != m_aSubstVarMap.end() ) { @@ -956,7 +956,7 @@ throw ( NoSuchElementException, RuntimeException ) // recursion depth reached! if ( bSubstRequired ) { - rtl::OUString aMsg( RTL_CONSTASCII_USTRINGPARAM( "Endless recursion detected. Cannot substitute variables!" )); + OUString aMsg( "Endless recursion detected. Cannot substitute variables!" ); throw NoSuchElementException( aMsg, (cppu::OWeakObject *)this ); } else @@ -967,7 +967,7 @@ throw ( NoSuchElementException, RuntimeException ) // variable in text but unknown! if ( bSubstRequired ) { - rtl::OUString aMsg( RTL_CONSTASCII_USTRINGPARAM( "Unknown variable found!" )); + OUString aMsg( "Unknown variable found!" ); throw NoSuchElementException( aMsg, (cppu::OWeakObject *)this ); } else @@ -978,10 +978,10 @@ throw ( NoSuchElementException, RuntimeException ) return aResult; } -rtl::OUString SubstitutePathVariables::impl_reSubstituteVariables( const ::rtl::OUString& rURL ) +OUString SubstitutePathVariables::impl_reSubstituteVariables( const OUString& rURL ) throw ( RuntimeException ) { - rtl::OUString aURL; + OUString aURL; INetURLObject aUrl( rURL ); if ( !aUrl.HasError() ) @@ -989,7 +989,7 @@ throw ( RuntimeException ) else { // Convert a system path to a UCB compliant URL before resubstitution - rtl::OUString aTemp; + OUString aTemp; if ( osl::FileBase::getFileURLFromSystemPath( rURL, aTemp ) == osl::FileBase::E_None ) { aTemp = ConvertOSLtoUCBURL( aTemp ); @@ -1021,7 +1021,7 @@ throw ( RuntimeException ) ReSubstFixedVarOrderVector::const_iterator pIterFixed; for ( pIterFixed = m_aReSubstFixedVarOrder.begin(); pIterFixed != m_aReSubstFixedVarOrder.end(); ++pIterFixed ) { - rtl::OUString aValue = m_aPreDefVars.m_FixedVar[ (sal_Int32)pIterFixed->eVariable ]; + OUString aValue = m_aPreDefVars.m_FixedVar[ (sal_Int32)pIterFixed->eVariable ]; sal_Int32 nPos = aURL.indexOf( aValue ); if ( nPos >= 0 ) { @@ -1046,7 +1046,7 @@ throw ( RuntimeException ) if ( bMatch ) { - rtl::OUStringBuffer aStrBuffer( aURL.getLength() ); + OUStringBuffer aStrBuffer( aURL.getLength() ); aStrBuffer.append( aURL.copy( 0, nPos ) ); aStrBuffer.append( m_aPreDefVars.m_FixedVarNames[ (sal_Int32)pIterFixed->eVariable ] ); // Get the variable name for struct var name array! aStrBuffer.append( aURL.copy( nPos + aValue.getLength(), ( aURL.getLength() - ( nPos + aValue.getLength() )) )); @@ -1061,11 +1061,11 @@ throw ( RuntimeException ) ReSubstUserVarOrderVector::const_iterator pIterUser; for ( pIterUser = m_aReSubstUserVarOrder.begin(); pIterUser != m_aReSubstUserVarOrder.end(); ++pIterUser ) { - rtl::OUString aVarValue = pIterUser->aVarName; + OUString aVarValue = pIterUser->aVarName; sal_Int32 nPos = aURL.indexOf( aVarValue ); if ( nPos >= 0 ) { - rtl::OUStringBuffer aStrBuffer( aURL.getLength() ); + OUStringBuffer aStrBuffer( aURL.getLength() ); aStrBuffer.append( aURL.copy( 0, nPos ) ); aStrBuffer.append( m_aVarStart ); aStrBuffer.append( aVarValue ); @@ -1086,17 +1086,17 @@ throw ( RuntimeException ) } // This method support both request schemes "$("<varname>")" or "<varname>". -::rtl::OUString SubstitutePathVariables::impl_getSubstituteVariableValue( const ::rtl::OUString& rVariable ) +OUString SubstitutePathVariables::impl_getSubstituteVariableValue( const OUString& rVariable ) throw ( NoSuchElementException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::impl_getSubstituteVariableValue" ); - rtl::OUString aVariable; + OUString aVariable; sal_Int32 nPos = rVariable.indexOf( m_aVarStart ); if ( nPos == -1 ) { // Prepare variable name before hash map access - rtl::OUStringBuffer aStrBuffer( rVariable.getLength() + m_aVarStart.getLength() + m_aVarEnd.getLength() ); + OUStringBuffer aStrBuffer( rVariable.getLength() + m_aVarStart.getLength() + m_aVarEnd.getLength() ); aStrBuffer.append( m_aVarStart ); aStrBuffer.append( rVariable ); aStrBuffer.append( m_aVarEnd ); @@ -1144,8 +1144,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::SetPredefinedPathVariables" ); - aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR")); + aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] = OUString("$BRAND_BASE_DIR"); rtl::Bootstrap::expandMacros( aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]); @@ -1153,7 +1152,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable // Get inspath and userpath from bootstrap mechanism in every case as file URL ::utl::Bootstrap::PathStatus aState; - ::rtl::OUString sVal ; + OUString sVal ; aState = utl::Bootstrap::locateUserData( sVal ); //There can be the valid case that there is no user installation. @@ -1181,7 +1180,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable // Set $(prog), $(progpath), $(progurl) INetURLObject aProgObj( aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] ); - if ( !aProgObj.HasError() && aProgObj.insertName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("program")) ) ) + if ( !aProgObj.HasError() && aProgObj.insertName( OUString("program") ) ) { aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] = aProgObj.GetMainURL(INetURLObject::NO_DECODE); aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ]; @@ -1190,7 +1189,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable // Detect the language type of the current office aPreDefPathVariables.m_eLanguageType = LANGUAGE_ENGLISH_US; - rtl::OUString aLocaleStr( utl::ConfigManager::getLocale() ); + OUString aLocaleStr( utl::ConfigManager::getLocale() ); aPreDefPathVariables.m_eLanguageType = LanguageTag( aLocaleStr ).getLanguageType(); // We used to have an else branch here with a LOG_ERROR, but that // always fired in some unit tests when this code was built with @@ -1200,13 +1199,13 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable // Set $(lang) aPreDefPathVariables.m_FixedVar[ PREDEFVAR_LANG ] = ConvertOSLtoUCBURL( - rtl::OUString::createFromAscii( ResMgr::GetLang( aPreDefPathVariables.m_eLanguageType, 0 ) )); + OUString::createFromAscii( ResMgr::GetLang( aPreDefPathVariables.m_eLanguageType, 0 ) )); // Set $(vlang) aPreDefPathVariables.m_FixedVar[ PREDEFVAR_VLANG ] = aLocaleStr; // Set $(langid) - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_LANGID ] = rtl::OUString::valueOf( (sal_Int32)aPreDefPathVariables.m_eLanguageType ); + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_LANGID ] = OUString::valueOf( (sal_Int32)aPreDefPathVariables.m_eLanguageType ); // Set the other pre defined path variables // Set $(work) diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 5935c512974c..b90ef2cef4ab 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -107,15 +107,15 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI { ::comphelper::SequenceAsHashMap lArgs(lArguments); - css::uno::Reference< css::frame::XFrame > xParentFrame = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_PARENTFRAME) , css::uno::Reference< css::frame::XFrame >()); - ::rtl::OUString sFrameName = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_FRAMENAME) , ::rtl::OUString() ); - sal_Bool bVisible = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_MAKEVISIBLE) , sal_False ); - sal_Bool bCreateTopWindow = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_CREATETOPWINDOW) , sal_True ); + css::uno::Reference< css::frame::XFrame > xParentFrame = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_PARENTFRAME) , css::uno::Reference< css::frame::XFrame >()); + OUString sFrameName = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_FRAMENAME) , OUString() ); + sal_Bool bVisible = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_MAKEVISIBLE) , sal_False ); + sal_Bool bCreateTopWindow = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_CREATETOPWINDOW) , sal_True ); // only possize=[0,0,0,0] triggers default handling of vcl ! - css::awt::Rectangle aPosSize = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_POSSIZE) , css::awt::Rectangle(0, 0, 0, 0) ); - css::uno::Reference< css::awt::XWindow > xContainerWindow = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_CONTAINERWINDOW) , css::uno::Reference< css::awt::XWindow >() ); - sal_Bool bSupportPersistentWindowState = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE) , sal_False ); - sal_Bool bEnableTitleBarUpdate = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_ENABLE_TITLEBARUPDATE) , sal_True ); + css::awt::Rectangle aPosSize = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_POSSIZE) , css::awt::Rectangle(0, 0, 0, 0) ); + css::uno::Reference< css::awt::XWindow > xContainerWindow = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_CONTAINERWINDOW) , css::uno::Reference< css::awt::XWindow >() ); + sal_Bool bSupportPersistentWindowState = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE) , sal_False ); + sal_Bool bEnableTitleBarUpdate = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_ENABLE_TITLEBARUPDATE) , sal_True ); /* SAFE { */ ReadGuard aReadLock( m_aLock ); @@ -125,7 +125,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI // We use FrameName property to set it as API name of the new created frame later. // But those frame names must be different from the set of special target names as e.g. _blank, _self etcpp ! - ::rtl::OUString sRightName = impl_filterNames(sFrameName); + OUString sRightName = impl_filterNames(sFrameName); // if no external frame window was given ... create a new one. if ( ! xContainerWindow.is()) @@ -229,7 +229,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai if (bTopWindow) { aDescriptor.Type = css::awt::WindowClass_TOP ; - aDescriptor.WindowServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("window")); + aDescriptor.WindowServiceName = OUString("window"); aDescriptor.ParentIndex = -1 ; aDescriptor.Parent = css::uno::Reference< css::awt::XWindowPeer >() ; aDescriptor.Bounds = aPosSize ; @@ -242,7 +242,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai else { aDescriptor.Type = css::awt::WindowClass_TOP ; - aDescriptor.WindowServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dockingwindow")); + aDescriptor.WindowServiceName = OUString("dockingwindow"); aDescriptor.ParentIndex = 1 ; aDescriptor.Parent = xParentWindowPeer ; aDescriptor.Bounds = aPosSize ; @@ -253,7 +253,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai css::uno::Reference< css::awt::XWindowPeer > xPeer = xToolkit->createWindow( aDescriptor ); css::uno::Reference< css::awt::XWindow > xWindow ( xPeer, css::uno::UNO_QUERY ); if ( ! xWindow.is()) - throw css::uno::Exception(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TaskCreator service was not able to create suitable frame window.")), + throw css::uno::Exception(OUString("TaskCreator service was not able to create suitable frame window."), static_cast< ::cppu::OWeakObject* >(this)); if (bTopWindow) xPeer->setBackground(::svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor); @@ -266,7 +266,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai //----------------------------------------------- css::uno::Reference< css::frame::XFrame > TaskCreatorService::implts_createFrame( const css::uno::Reference< css::frame::XFrame >& xParentFrame , const css::uno::Reference< css::awt::XWindow >& xContainerWindow, - const ::rtl::OUString& sName ) + const OUString& sName ) { // SAFE -> ReadGuard aReadLock( m_aLock ); @@ -357,9 +357,9 @@ void TaskCreatorService::implts_establishTitleBarUpdate( const css::uno::Referen } //----------------------------------------------- -::rtl::OUString TaskCreatorService::impl_filterNames( const ::rtl::OUString& sName ) +OUString TaskCreatorService::impl_filterNames( const OUString& sName ) { - ::rtl::OUString sFiltered; + OUString sFiltered; if (TargetHelper::isValidNameForFrame(sName)) sFiltered = sName; return sFiltered; diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 4b3e15aa05db..304dc2c1f841 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -93,8 +93,8 @@ TabWindow::TabWindow( const css::uno::Reference< css::lang::XMultiServiceFactory , m_bInitialized( sal_False ) , m_bDisposed( sal_False ) , m_nNextTabID( 1 ) - , m_aTitlePropName( RTL_CONSTASCII_USTRINGPARAM( "Title" )) - , m_aPosPropName( RTL_CONSTASCII_USTRINGPARAM( "Position" )) + , m_aTitlePropName( "Title" ) + , m_aPosPropName( "Position" ) , m_xServiceManager( xServiceManager ) , m_aListenerContainer( m_aLock.getShareableOslMutex() ) { @@ -156,7 +156,7 @@ TabControl* TabWindow::impl_GetTabControl( const css::uno::Reference< css::awt:: return NULL; } -void TabWindow::impl_SetTitle( const ::rtl::OUString& rTitle ) +void TabWindow::impl_SetTitle( const OUString& rTitle ) { if ( m_xTopWindow.is() ) { @@ -244,7 +244,7 @@ IMPL_LINK( TabWindow, Activate, TabControl*, pTabControl ) sal_Int32 nPageId = pTabControl->GetCurPageId(); - rtl::OUString aTitle = pTabControl->GetPageText( sal_uInt16( nPageId )); + OUString aTitle = pTabControl->GetPageText( sal_uInt16( nPageId )); impl_SetTitle( aTitle ); aLock.unlock(); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -274,8 +274,8 @@ IMPL_LINK( TabWindow, Deactivate, TabControl*, pTabControl ) void SAL_CALL TabWindow::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException) { - const rtl::OUString aTopWindowArgName( RTL_CONSTASCII_USTRINGPARAM( "TopWindow" )); - const rtl::OUString aSizeArgName( RTL_CONSTASCII_USTRINGPARAM( "Size" )); + const OUString aTopWindowArgName( "TopWindow" ); + const OUString aSizeArgName( "Size" ); css::awt::Size aDefaultSize( 500, 500 ); css::awt::Size aSize( aDefaultSize ); @@ -605,7 +605,7 @@ throw (css::uno::RuntimeException) sal_Int32 nNextTabID( m_nNextTabID++ ); - rtl::OUString aTitle; + OUString aTitle; TabControl* pTabControl = impl_GetTabControl( m_xTabControlWindow ); if ( pTabControl ) pTabControl->InsertPage( sal_uInt16( nNextTabID ), aTitle ); @@ -669,10 +669,10 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) { comphelper::SequenceAsHashMap aSeqHashMap( Properties ); - ::rtl::OUString aTitle = pTabControl->GetPageText( sal_uInt16( ID )); + OUString aTitle = pTabControl->GetPageText( sal_uInt16( ID )); sal_Int32 nNewPos = nPos; - aTitle = aSeqHashMap.getUnpackedValueOrDefault< ::rtl::OUString >( + aTitle = aSeqHashMap.getUnpackedValueOrDefault< OUString >( m_aTitlePropName, aTitle ); pTabControl->SetPageText( sal_uInt16( ID ), aTitle ); nNewPos = aSeqHashMap.getUnpackedValueOrDefault< sal_Int32 >( @@ -715,7 +715,7 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) throw css::lang::IndexOutOfBoundsException(); else { - rtl::OUString aTitle = pTabControl->GetPageText( sal_uInt16( ID )); + OUString aTitle = pTabControl->GetPageText( sal_uInt16( ID )); nPos = pTabControl->GetPagePos( sal_uInt16( ID )); css::uno::Sequence< css::beans::NamedValue > aSeq( 2 ); @@ -749,7 +749,7 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) else { sal_Int32 nOldID = pTabControl->GetCurPageId(); - rtl::OUString aTitle = pTabControl->GetPageText( sal_uInt16( ID )); + OUString aTitle = pTabControl->GetPageText( sal_uInt16( ID )); pTabControl->SetCurPageId( sal_uInt16( ID )); pTabControl->SelectTabPage( sal_uInt16( ID )); impl_SetTitle( aTitle ); diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx index cf8517f51f50..258eec7dee2c 100644 --- a/framework/source/tabwin/tabwinfactory.cxx +++ b/framework/source/tabwin/tabwinfactory.cxx @@ -78,7 +78,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TabWinFactory::createInstan const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& ) throw ( css::uno::Exception, css::uno::RuntimeException ) { - const rtl::OUString aTopWindowArgName( RTL_CONSTASCII_USTRINGPARAM( "TopWindow" )); + const OUString aTopWindowArgName( "TopWindow"); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index 9bab7aabd23b..0912b7bdcc1d 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -89,11 +89,11 @@ class GlobalSettings_Access : public ::com::sun::star::lang::XComponent , sal_Bool m_bDisposed : 1, m_bConfigRead : 1; - rtl::OUString m_aConfigSettingsAccess; - rtl::OUString m_aNodeRefStates; - rtl::OUString m_aPropStatesEnabled; - rtl::OUString m_aPropLocked; - rtl::OUString m_aPropDocked; + OUString m_aConfigSettingsAccess; + OUString m_aNodeRefStates; + OUString m_aPropStatesEnabled; + OUString m_aPropLocked; + OUString m_aPropDocked; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xConfigAccess; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext; }; @@ -112,11 +112,11 @@ GlobalSettings_Access::GlobalSettings_Access( const css::uno::Reference< css::un ThreadHelpBase(), m_bDisposed( sal_False ), m_bConfigRead( sal_False ), - m_aConfigSettingsAccess( RTL_CONSTASCII_USTRINGPARAM( GLOBALSETTINGS_ROOT_ACCESS )), - m_aNodeRefStates( RTL_CONSTASCII_USTRINGPARAM( GLOBALSETTINGS_NODEREF_STATES )), - m_aPropStatesEnabled( RTL_CONSTASCII_USTRINGPARAM( GLOBALSETTINGS_PROPERTY_STATESENABLED )), - m_aPropLocked( RTL_CONSTASCII_USTRINGPARAM( GLOBALSETTINGS_PROPERTY_LOCKED )), - m_aPropDocked( RTL_CONSTASCII_USTRINGPARAM( GLOBALSETTINGS_PROPERTY_DOCKED )), + m_aConfigSettingsAccess( GLOBALSETTINGS_ROOT_ACCESS ), + m_aNodeRefStates( GLOBALSETTINGS_NODEREF_STATES ), + m_aPropStatesEnabled( GLOBALSETTINGS_PROPERTY_STATESENABLED ), + m_aPropLocked( GLOBALSETTINGS_PROPERTY_LOCKED ), + m_aPropDocked( GLOBALSETTINGS_PROPERTY_DOCKED ), m_xContext( rxContext ) { } @@ -252,10 +252,10 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess() css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider = css::configuration::theDefaultProvider::get( m_xContext ); - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" )); - aPropValue.Value = css::uno::makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GLOBALSETTINGS_ROOT_ACCESS ))); + aPropValue.Name = OUString( "nodepath" ); + aPropValue.Value = css::uno::makeAny( OUString( GLOBALSETTINGS_ROOT_ACCESS )); aArgs[0] = css::uno::makeAny( aPropValue ); - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" )); + aPropValue.Name = OUString( "lazywrite" ); aPropValue.Value = css::uno::makeAny( sal_True ); aArgs[1] = css::uno::makeAny( aPropValue ); diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index f18f6f2d2664..c268cfb0213b 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -110,8 +110,8 @@ ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier( cons { // Retrieve known modules and insert them into our boost::unordered_map to speed-up access time. Reference< XNameAccess > xNameAccess( m_xModuleMgr, UNO_QUERY_THROW ); - const Sequence< ::rtl::OUString > aNameSeq = xNameAccess->getElementNames(); - const ::rtl::OUString* pNameSeq = aNameSeq.getConstArray(); + const Sequence< OUString > aNameSeq = xNameAccess->getElementNames(); + const OUString* pNameSeq = aNameSeq.getConstArray(); for ( sal_Int32 n = 0; n < aNameSeq.getLength(); n++ ) m_aModuleToModuleUICfgMgrMap.insert( ModuleToModuleCfgMgr::value_type( pNameSeq[n], Reference< XUIConfigurationManager >() )); } @@ -175,7 +175,7 @@ throw ( RuntimeException ) } // XModuleUIConfigurationManagerSupplier -Reference< XUIConfigurationManager > SAL_CALL ModuleUIConfigurationManagerSupplier::getUIConfigurationManager( const ::rtl::OUString& ModuleIdentifier ) +Reference< XUIConfigurationManager > SAL_CALL ModuleUIConfigurationManagerSupplier::getUIConfigurationManager( const OUString& ModuleIdentifier ) throw ( NoSuchElementException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManagerSupplier::getUIConfigurationManager" ); @@ -193,7 +193,7 @@ throw ( NoSuchElementException, RuntimeException) // Create instance on demand if ( !pIter->second.is() ) { - ::rtl::OUString sShort; + OUString sShort; try { Sequence< PropertyValue > lProps; @@ -210,17 +210,17 @@ throw ( NoSuchElementException, RuntimeException) } catch( const Exception& ) { - sShort = ::rtl::OUString(); + sShort = OUString(); } if (sShort.isEmpty()) throw NoSuchElementException(); PropertyValue aArg; Sequence< Any > aArgs( 2 ); - aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleShortName" )); + aArg.Name = OUString( "ModuleShortName" ); aArg.Value <<= sShort; aArgs[0] <<= aArg; - aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleIdentifier" )); + aArg.Name = OUString( "ModuleIdentifier" ); aArg.Value <<= ModuleIdentifier; aArgs[1] <<= aArg; diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 3a0240e11240..216f31a66b9b 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -78,7 +78,7 @@ static const sal_uInt16 TOOLBOXITEM_SEPARATOR_STR_LEN = sizeof( TOOLBOXITEM_SEPA AddonsToolBarManager::AddonsToolBarManager( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, - const rtl::OUString& rResourceName, + const OUString& rResourceName, ToolBar* pToolBar ) : ToolBarManager( rServiceManager, rFrame, rResourceName, pToolBar ) { @@ -97,7 +97,7 @@ AddonsToolBarManager::~AddonsToolBarManager() { } -static sal_Bool IsCorrectContext( const ::rtl::OUString& rModuleIdentifier, const ::rtl::OUString& aContextList ) +static sal_Bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString& aContextList ) { if ( aContextList.isEmpty() ) return sal_True; @@ -112,8 +112,8 @@ static sal_Bool IsCorrectContext( const ::rtl::OUString& rModuleIdentifier, cons } static Image RetrieveImage( Reference< com::sun::star::frame::XFrame >& rFrame, - const rtl::OUString& aImageId, - const rtl::OUString& aURL, + const OUString& aImageId, + const OUString& aURL, sal_Bool bBigImage ) { @@ -181,8 +181,8 @@ void AddonsToolBarManager::RefreshImages() if ( nId > 0 ) { - ::rtl::OUString aCommandURL = m_pToolBar->GetItemCommand( nId ); - ::rtl::OUString aImageId; + OUString aCommandURL = m_pToolBar->GetItemCommand( nId ); + OUString aImageId; AddonsParams* pRuntimeItemData = (AddonsParams*)m_pToolBar->GetItemData( nId ); if ( pRuntimeItemData ) aImageId = pRuntimeItemData->aImageId; @@ -212,7 +212,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue m_pToolBar->Clear(); m_aControllerMap.clear(); - ::rtl::OUString aModuleIdentifier; + OUString aModuleIdentifier; try { Reference< XModuleManager2 > xModuleManager = ModuleManager::create( comphelper::getComponentContext(m_xServiceManager) ); @@ -231,12 +231,12 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue Reference< XWindow > xToolbarWindow = VCLUnoHelper::GetInterface( m_pToolBar ); for ( sal_uInt32 n = 0; n < (sal_uInt32)rAddonToolbar.getLength(); n++ ) { - rtl::OUString aURL; - rtl::OUString aTitle; - rtl::OUString aImageId; - rtl::OUString aContext; - rtl::OUString aTarget; - rtl::OUString aControlType; + OUString aURL; + OUString aTitle; + OUString aImageId; + OUString aContext; + OUString aTarget; + OUString aControlType; sal_uInt16 nWidth( 0 ); const Sequence< PropertyValue >& rSeq = rAddonToolbar[n]; @@ -290,19 +290,19 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue Sequence< Any > aArgs(5); PropertyValue aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" )); + aPropValue.Name = OUString( "ModuleName" ); aPropValue.Value <<= m_aModuleIdentifier; aArgs[0] <<= aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); + aPropValue.Name = OUString( "Frame" ); aPropValue.Value <<= m_xFrame; aArgs[1] <<= aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ServiceManager" )); + aPropValue.Name = OUString( "ServiceManager" ); aPropValue.Value <<= m_xServiceManager; aArgs[2] <<= aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )); + aPropValue.Name = OUString( "ParentWindow" ); aPropValue.Value <<= xToolbarWindow; aArgs[3] <<= aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ItemId" )); + aPropValue.Name = OUString( "ItemId" ); aPropValue.Value = makeAny( sal_Int32( nId )); aArgs[4] <<= aPropValue; @@ -334,13 +334,13 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue { PropertyValue aPropValue; Sequence< Any > aArgs( 3 ); - aPropValue.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); + aPropValue.Name = OUString( "Frame" ); aPropValue.Value <<= m_xFrame; aArgs[0] <<= aPropValue; - aPropValue.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" )); + aPropValue.Name = OUString( "CommandURL" ); aPropValue.Value <<= aURL; aArgs[1] <<= aPropValue; - aPropValue.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ServiceManager" )); + aPropValue.Name = OUString( "ServiceManager" ); aPropValue.Value <<= m_xServiceManager; aArgs[2] <<= aPropValue; try diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 88dc3f30c906..3757f7adc977 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -145,7 +145,7 @@ ComboboxToolbarController::ComboboxToolbarController( ToolBox* pToolbar, sal_uInt16 nID, sal_Int32 nWidth, - const ::rtl::OUString& aCommand ) : + const OUString& aCommand ) : ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) , m_pComboBox( 0 ) { @@ -186,12 +186,12 @@ throw ( RuntimeException ) Sequence<PropertyValue> ComboboxToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); - ::rtl::OUString aSelectedText = m_pComboBox->GetText(); + OUString aSelectedText = m_pComboBox->GetText(); // Add key modifier to argument list - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" )); + aArgs[0].Name = OUString( "KeyModifier" ); aArgs[0].Value <<= KeyModifier; - aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )); + aArgs[1].Name = OUString( "Text" ); aArgs[1].Value <<= aSelectedText; return aArgs; } @@ -271,7 +271,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) { - rtl::OUString aText; + OUString aText; rControlCommand.Arguments[i].Value >>= aText; m_pComboBox->SetText( aText ); @@ -287,7 +287,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "List", 4 )) { - Sequence< ::rtl::OUString > aList; + Sequence< OUString > aList; m_pComboBox->Clear(); rControlCommand.Arguments[i].Value >>= aList; @@ -296,9 +296,9 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f // send notification uno::Sequence< beans::NamedValue > aInfo( 1 ); - aInfo[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "List" )); + aInfo[0].Name = OUString( "List" ); aInfo[0].Value <<= aList; - addNotifyInfo( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListChanged" )), + addNotifyInfo( OUString( "ListChanged" ), getDispatchFromCommand( m_aCommandURL ), aInfo ); @@ -309,7 +309,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f else if ( rControlCommand.Command.equalsAsciiL( "AddEntry", 8 )) { sal_uInt16 nPos( COMBOBOX_APPEND ); - rtl::OUString aText; + OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) @@ -323,7 +323,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f else if ( rControlCommand.Command.equalsAsciiL( "InsertEntry", 11 )) { sal_uInt16 nPos( COMBOBOX_APPEND ); - rtl::OUString aText; + OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Pos", 3 )) @@ -364,7 +364,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) { - rtl::OUString aText; + OUString aText; if ( rControlCommand.Arguments[i].Value >>= aText ) m_pComboBox->RemoveEntry( aText ); break; diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index a5438c9c7da8..ac746a76924c 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -127,7 +127,7 @@ DropdownToolbarController::DropdownToolbarController( ToolBox* pToolbar, sal_uInt16 nID, sal_Int32 nWidth, - const ::rtl::OUString& aCommand ) : + const OUString& aCommand ) : ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) , m_pListBoxControl( 0 ) { @@ -169,12 +169,12 @@ throw ( RuntimeException ) Sequence<PropertyValue> DropdownToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); - ::rtl::OUString aSelectedText = m_pListBoxControl->GetSelectEntry(); + OUString aSelectedText = m_pListBoxControl->GetSelectEntry(); // Add key modifier to argument list - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" )); + aArgs[0].Name = OUString( "KeyModifier" ); aArgs[0].Value <<= KeyModifier; - aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )); + aArgs[1].Name = OUString( "Text" ); aArgs[1].Value <<= aSelectedText; return aArgs; } @@ -221,7 +221,7 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "List", 4 )) { - Sequence< ::rtl::OUString > aList; + Sequence< OUString > aList; m_pListBoxControl->Clear(); rControlCommand.Arguments[i].Value >>= aList; @@ -232,9 +232,9 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f // send notification uno::Sequence< beans::NamedValue > aInfo( 1 ); - aInfo[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "List" )); + aInfo[0].Name = OUString( "List" ); aInfo[0].Value <<= aList; - addNotifyInfo( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListChanged" )), + addNotifyInfo( OUString( "ListChanged" ), getDispatchFromCommand( m_aCommandURL ), aInfo ); @@ -245,7 +245,7 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f else if ( rControlCommand.Command.equalsAsciiL( "AddEntry", 8 )) { sal_uInt16 nPos( LISTBOX_APPEND ); - rtl::OUString aText; + OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) @@ -259,7 +259,7 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f else if ( rControlCommand.Command.equalsAsciiL( "InsertEntry", 11 )) { sal_uInt16 nPos( LISTBOX_APPEND ); - rtl::OUString aText; + OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Pos", 3 )) @@ -300,7 +300,7 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) { - rtl::OUString aText; + OUString aText; if ( rControlCommand.Arguments[i].Value >>= aText ) m_pListBoxControl->RemoveEntry( aText ); break; diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index beea47f79a9e..ba3ae7eb871d 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -126,7 +126,7 @@ EditToolbarController::EditToolbarController( ToolBox* pToolbar, sal_uInt16 nID, sal_Int32 nWidth, - const ::rtl::OUString& aCommand ) : + const OUString& aCommand ) : ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) , m_pEditControl( 0 ) { @@ -166,12 +166,12 @@ throw ( RuntimeException ) Sequence<PropertyValue> EditToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); - ::rtl::OUString aSelectedText = m_pEditControl->GetText(); + OUString aSelectedText = m_pEditControl->GetText(); // Add key modifier to argument list - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" )); + aArgs[0].Name = OUString( "KeyModifier" ); aArgs[0].Value <<= KeyModifier; - aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )); + aArgs[1].Name = OUString( "Text" ); aArgs[1].Value <<= aSelectedText; return aArgs; } @@ -225,7 +225,7 @@ void EditToolbarController::executeControlCommand( const ::com::sun::star::frame { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) { - rtl::OUString aText; + OUString aText; rControlCommand.Arguments[i].Value >>= aText; m_pEditControl->SetText( aText ); diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 12ead5c6227e..f2076a93dd99 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -91,22 +91,22 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra { Reference< XNameAccess > xStyleFamilies = xStyleFamiliesSupplier->getStyleFamilies(); - rtl::OUString aCmd( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPageHeader" )); - rtl::OUString aHeaderFooterIsOnStr(RTL_CONSTASCII_USTRINGPARAM( "HeaderIsOn" )); + OUString aCmd( ".uno:InsertPageHeader" ); + OUString aHeaderFooterIsOnStr( "HeaderIsOn" ); if ( m_bFooter ) { - aCmd = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPageFooter" )); - aHeaderFooterIsOnStr = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterIsOn" )); + aCmd = OUString( ".uno:InsertPageFooter" ); + aHeaderFooterIsOnStr = OUString( "FooterIsOn" ); } - const rtl::OUString aIsPhysicalStr( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" )); - const rtl::OUString aDisplayNameStr( RTL_CONSTASCII_USTRINGPARAM( "DisplayName" )); + const OUString aIsPhysicalStr( "IsPhysical" ); + const OUString aDisplayNameStr( "DisplayName" ); try { Reference< XNameContainer > xNameContainer; - if ( xStyleFamilies->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageStyles" ))) >>= xNameContainer ) + if ( xStyleFamilies->getByName( OUString( "PageStyles" )) >>= xNameContainer ) { - Sequence< rtl::OUString > aSeqNames = xNameContainer->getElementNames(); + Sequence< OUString > aSeqNames = xNameContainer->getElementNames(); sal_uInt16 nId = 2; sal_uInt16 nCount = 0; @@ -116,19 +116,19 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra sal_Bool bFirstItemInserted( sal_False ); for ( sal_Int32 n = 0; n < aSeqNames.getLength(); n++ ) { - rtl::OUString aName = aSeqNames[n]; + OUString aName = aSeqNames[n]; Reference< XPropertySet > xPropSet( xNameContainer->getByName( aName ), UNO_QUERY ); if ( xPropSet.is() ) { sal_Bool bIsPhysical( sal_False ); if (( xPropSet->getPropertyValue( aIsPhysicalStr ) >>= bIsPhysical ) && bIsPhysical ) { - rtl::OUString aDisplayName; + OUString aDisplayName; sal_Bool bHeaderIsOn( sal_False ); xPropSet->getPropertyValue( aDisplayNameStr ) >>= aDisplayName; xPropSet->getPropertyValue( aHeaderFooterIsOnStr ) >>= bHeaderIsOn; - rtl::OUStringBuffer aStrBuf( aCmd ); + OUStringBuffer aStrBuf( aCmd ); aStrBuf.appendAscii( "?PageStyle:string="); aStrBuf.append( aDisplayName ); aStrBuf.appendAscii( "&On:bool=" ); @@ -136,7 +136,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra aStrBuf.appendAscii( "true" ); else aStrBuf.appendAscii( "false" ); - rtl::OUString aCommand( aStrBuf.makeStringAndClear() ); + OUString aCommand( aStrBuf.makeStringAndClear() ); pVCLPopupMenu->InsertItem( nId, aDisplayName, MIB_CHECKABLE ); if ( !bFirstItemInserted ) { @@ -164,7 +164,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra // Insert special item for all command pVCLPopupMenu->InsertItem( ALL_MENUITEM_ID, String( FwlResId( STR_MENU_HEADFOOTALL )), 0, OString(), 0 ); - rtl::OUStringBuffer aStrBuf( aCmd ); + OUStringBuffer aStrBuf( aCmd ); aStrBuf.appendAscii( "?On:bool=" ); // Command depends on check state of first menu item entry diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index cabe8b14005e..9390838e1fdf 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -81,14 +81,14 @@ uno::Reference< util::XMacroExpander > GetMacroExpander() return xMacroExpander; } -static void SubstituteVariables( ::rtl::OUString& aURL ) +static void SubstituteVariables( OUString& aURL ) { if ( aURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( EXPAND_PROTOCOL )) == 0 ) { uno::Reference< util::XMacroExpander > xMacroExpander = GetMacroExpander(); // cut protocol - rtl::OUString aMacro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1 ) ); + OUString aMacro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1 ) ); // decode uric class chars aMacro = ::rtl::Uri::decode( aMacro, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); // expand macro string @@ -103,7 +103,7 @@ ImageButtonToolbarController::ImageButtonToolbarController( const Reference< XFrame >& rFrame, ToolBox* pToolbar, sal_uInt16 nID, - const ::rtl::OUString& aCommand ) : + const OUString& aCommand ) : ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) { sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); @@ -142,7 +142,7 @@ void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "URL", 3 )) { - rtl::OUString aURL; + OUString aURL; rControlCommand.Arguments[i].Value >>= aURL; SubstituteVariables( aURL ); @@ -156,9 +156,9 @@ void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star // send notification uno::Sequence< beans::NamedValue > aInfo( 1 ); - aInfo[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" )); + aInfo[0].Name = OUString( "URL" ); aInfo[0].Value <<= aURL; - addNotifyInfo( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ImageChanged" )), + addNotifyInfo( OUString( "ImageChanged" ), getDispatchFromCommand( m_aCommandURL ), aInfo ); break; @@ -168,7 +168,7 @@ void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star } } -sal_Bool ImageButtonToolbarController::ReadImageFromURL( sal_Bool bBigImage, const ::rtl::OUString& aImageURL, Image& aImage ) +sal_Bool ImageButtonToolbarController::ReadImageFromURL( sal_Bool bBigImage, const OUString& aImageURL, Image& aImage ) { SvStream* pStream = utl::UcbStreamHelper::CreateStream( aImageURL, STREAM_STD_READ ); if ( pStream && ( pStream->GetErrorCode() == 0 )) diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 69fc8b6928be..9fd48a40a289 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -188,7 +188,7 @@ throw (::com::sun::star::uno::RuntimeException) // add first few entries to main menu sal_Int16 nItemId = static_cast< sal_Int16 >(MID_LANG_SEL_1); - const OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*")); // multiple languages in current selection + const OUString sAsterix("*"); // multiple languages in current selection const OUString sEmpty; // 'no language found' from language guessing std::map< sal_Int16, OUString > aLangMap; std::set< OUString >::const_iterator it; @@ -264,45 +264,45 @@ throw (::com::sun::star::uno::RuntimeException) { //set selected language as current language for selection String aSelectedLang = aLangMap[nId]; - aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Current_")); + aURL.Complete += OUString(".uno:LanguageStatus?Language:string=Current_"); aURL.Complete += aSelectedLang; } else if (nId == MID_LANG_SEL_NONE) { //set None as current language for selection - aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE")); + aURL.Complete += OUString(".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE"); } else if (nId == MID_LANG_SEL_RESET) { // reset language attributes for selection - aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES")); + aURL.Complete += OUString(".uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES"); } else if (nId == MID_LANG_SEL_MORE) { //open the dialog "format/character" for current selection - aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FontDialog?Language:string=*")); + aURL.Complete += OUString(".uno:FontDialog?Language:string=*"); } else if (MID_LANG_PARA_1 <= nId && nId <= MID_LANG_PARA_9) { //set selected language for current paragraph String aSelectedLang = aLangMap[nId]; - aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Paragraph_")); + aURL.Complete += OUString(".uno:LanguageStatus?Language:string=Paragraph_"); aURL.Complete += aSelectedLang; } else if (nId == MID_LANG_PARA_NONE) { //set None as language for current paragraph - aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE")); + aURL.Complete += OUString(".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE"); } else if (nId == MID_LANG_PARA_RESET) { // reset language attributes for paragraph - aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES")); + aURL.Complete += OUString(".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES"); } else if (nId == MID_LANG_PARA_MORE) { //open the dialog "format/character" for current paragraph - aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FontDialogForParagraph")); + aURL.Complete += OUString(".uno:FontDialogForParagraph"); } uno::Reference< util::XURLTransformer > xURLTransformer( util::URLTransformer::create(::comphelper::getComponentContext(m_xServiceManager)) ); diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx index 772a3aa15bb3..468f1512bf88 100644 --- a/framework/source/uielement/popupmenucontroller.cxx +++ b/framework/source/uielement/popupmenucontroller.cxx @@ -34,7 +34,7 @@ #include "uielement/popupmenucontroller.hxx" #include "services.h" -using rtl::OUString; +using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -49,8 +49,8 @@ namespace framework DEFINE_XSERVICEINFO_MULTISERVICE ( PopupMenuController , OWeakObject , - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ) ) , - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.framework.PopupMenuController" ) ) + OUString( "com.sun.star.frame.ToolbarController" ) , + OUString( "com.sun.star.comp.framework.PopupMenuController" ) ) DEFINE_INIT_SERVICE ( PopupMenuController, {} ) @@ -165,10 +165,10 @@ bool PopupMenuController::CreatePopupMenuController() throw (Exception) Sequence< Any > aSeq( 2 ); PropertyValue aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" )); + aPropValue.Name = OUString( "ModuleName" ); aPropValue.Value <<= getModuleName(); aSeq[0] <<= aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); + aPropValue.Name = OUString( "Frame" ); aPropValue.Value <<= m_xFrame; aSeq[1] <<= aPropValue; diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index c43ba7783f27..b438db5e5fd1 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -68,7 +68,7 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper1< ::com::sun::star virtual ~RecentFilesStringLength() {} // XStringWidth - sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& aString ) + sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) throw (::com::sun::star::uno::RuntimeException) { return aString.getLength(); @@ -113,7 +113,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > int nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength(); // New vnd.sun.star.popup: command URL to support direct dispatches - const rtl::OUString aCmdPrefix( "vnd.sun.star.popup:RecentFileList?entry=" ); + const OUString aCmdPrefix( "vnd.sun.star.popup:RecentFileList?entry=" ); m_aRecentFilesItems.clear(); if (( nPickListMenuItems > 0 ) && !m_bDisabled ) @@ -147,28 +147,28 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > for ( sal_uInt32 i = 0; i < nCount; i++ ) { - ::rtl::OUString aMenuShortCut; + OUString aMenuShortCut; if ( i <= 9 ) { if ( i == 9 ) - aMenuShortCut = rtl::OUString( "1~0: " ); + aMenuShortCut = OUString( "1~0: " ); else { char menuShortCut[5] = "~n: "; menuShortCut[1] = (char)( '1' + i ); - aMenuShortCut = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(menuShortCut) ); + aMenuShortCut = OUString( RTL_CONSTASCII_USTRINGPARAM( menuShortCut )); } } else { - aMenuShortCut = rtl::OUString::valueOf((sal_Int32)( i + 1 )); - aMenuShortCut += rtl::OUString( ": " ); + aMenuShortCut = OUString::valueOf((sal_Int32)( i + 1 )); + aMenuShortCut += OUString( ": " ); } // Abbreviate URL - rtl::OUString aURLString( aCmdPrefix + rtl::OUString::valueOf( sal_Int32( i ))); - rtl::OUString aTipHelpText; - rtl::OUString aMenuTitle; + OUString aURLString( aCmdPrefix + OUString::valueOf( sal_Int32( i ))); + OUString aTipHelpText; + OUString aMenuTitle; INetURLObject aURL( m_aRecentFilesItems[i].aURL ); if ( aURL.GetProtocol() == INET_PROT_FILE ) @@ -177,8 +177,8 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > // path and abbreviate it with a special function: String aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) ); - ::rtl::OUString aSystemPath( aFileSystemPath ); - ::rtl::OUString aCompactedSystemPath; + OUString aSystemPath( aFileSystemPath ); + OUString aCompactedSystemPath; aTipHelpText = aSystemPath; oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL ); @@ -196,7 +196,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > aTipHelpText = aURLString; } - ::rtl::OUString aTitle( aMenuShortCut + aMenuTitle ); + OUString aTitle( aMenuShortCut + aMenuTitle ); pVCLPopupMenu->InsertItem( sal_uInt16( i+1 ), aTitle ); pVCLPopupMenu->SetTipHelpText( sal_uInt16( i+1 ), aTipHelpText ); @@ -239,11 +239,11 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) sal_Int32 nSize = 2; aArgsList.realloc(nSize); - aArgsList[0].Name = ::rtl::OUString( "Referer" ); - aArgsList[0].Value = makeAny( ::rtl::OUString(SFX_REFERER_USER )); + aArgsList[0].Name = OUString( "Referer" ); + aArgsList[0].Value = makeAny( OUString(SFX_REFERER_USER )); // documents in the picklist will never be opened as templates - aArgsList[1].Name = ::rtl::OUString( "AsTemplate" ); + aArgsList[1].Name = OUString( "AsTemplate" ); aArgsList[1].Value = makeAny( (sal_Bool) sal_False ); if (!m_aModuleName.isEmpty()) @@ -254,7 +254,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) aArgsList[nSize-1].Value <<= m_aModuleName; } - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString("_default"), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString("_default"), 0 ); } if ( xDispatch.is() ) @@ -353,7 +353,7 @@ void SAL_CALL RecentFilesMenuController::updatePopupMenu() throw (RuntimeExcepti // XDispatchProvider Reference< XDispatch > SAL_CALL RecentFilesMenuController::queryDispatch( const URL& aURL, - const ::rtl::OUString& /*sTarget*/, + const OUString& /*sTarget*/, sal_Int32 /*nFlags*/ ) throw( RuntimeException ) { @@ -383,13 +383,13 @@ throw( RuntimeException ) sal_Int32 nQueryPart = aURL.Complete.indexOf( '?', m_aBaseURL.getLength() ); if ( nQueryPart > 0 ) { - const rtl::OUString aEntryArgStr( "entry=" ); + const OUString aEntryArgStr( "entry=" ); sal_Int32 nEntryArg = aURL.Complete.indexOf( aEntryArgStr, nQueryPart ); sal_Int32 nEntryPos = nEntryArg + aEntryArgStr.getLength(); if (( nEntryArg > 0 ) && ( nEntryPos < aURL.Complete.getLength() )) { sal_Int32 nAddArgs = aURL.Complete.indexOf( '&', nEntryPos ); - rtl::OUString aEntryArg; + OUString aEntryArg; if ( nAddArgs < 0 ) aEntryArg = aURL.Complete.copy( nEntryPos ); diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx index 7cfa06bdd1ce..e0b3807030c6 100644 --- a/framework/source/uielement/simpletextstatusbarcontroller.cxx +++ b/framework/source/uielement/simpletextstatusbarcontroller.cxx @@ -48,7 +48,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE ( SimpleTextStatusbarController DEFINE_INIT_SERVICE ( SimpleTextStatusbarController, {} ) SimpleTextStatusbarController::SimpleTextStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) : - svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 ) + svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), OUString(), 0 ) { } @@ -76,13 +76,13 @@ void SAL_CALL SimpleTextStatusbarController::release() throw () void SAL_CALL SimpleTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { - const rtl::OUString aPropValueName( RTL_CONSTASCII_USTRINGPARAM( "Value" )); + const OUString aPropValueName( "Value" ); SolarMutexGuard aSolarMutexGuard; svt::StatusbarController::initialize( aArguments ); - rtl::OUString aValue; + OUString aValue; beans::PropertyValue aPropValue; // Check arguments for optional "Value" property. We need it diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index cc15f3fe19bb..efccbf2a6fd5 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -180,7 +180,7 @@ SpinfieldToolbarController::SpinfieldToolbarController( ToolBox* pToolbar, sal_uInt16 nID, sal_Int32 nWidth, - const ::rtl::OUString& aCommand ) : + const OUString& aCommand ) : ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) , m_bFloat( false ) , m_bMaxSet( false ) @@ -227,12 +227,12 @@ throw ( RuntimeException ) Sequence<PropertyValue> SpinfieldToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); - ::rtl::OUString aSpinfieldText = m_pSpinfieldControl->GetText(); + OUString aSpinfieldText = m_pSpinfieldControl->GetText(); // Add key modifier to argument list - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" )); + aArgs[0].Name = OUString( "KeyModifier" ); aArgs[0].Value <<= KeyModifier; - aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value" )); + aArgs[1].Name = OUString( "Value" ); if ( m_bFloat ) aArgs[1].Value <<= aSpinfieldText.toDouble(); else @@ -250,7 +250,7 @@ void SpinfieldToolbarController::Up() m_nValue = nValue; - rtl::OUString aText = impl_formatOutputString( m_nValue ); + OUString aText = impl_formatOutputString( m_nValue ); m_pSpinfieldControl->SetText( aText ); execute( 0 ); } @@ -263,7 +263,7 @@ void SpinfieldToolbarController::Down() m_nValue = nValue; - rtl::OUString aText = impl_formatOutputString( m_nValue ); + OUString aText = impl_formatOutputString( m_nValue ); m_pSpinfieldControl->SetText( aText ); execute( 0 ); } @@ -274,7 +274,7 @@ void SpinfieldToolbarController::First() { m_nValue = m_nMin; - rtl::OUString aText = impl_formatOutputString( m_nValue ); + OUString aText = impl_formatOutputString( m_nValue ); m_pSpinfieldControl->SetText( aText ); execute( 0 ); } @@ -286,7 +286,7 @@ void SpinfieldToolbarController::Last() { m_nValue = m_nMax; - rtl::OUString aText = impl_formatOutputString( m_nValue ); + OUString aText = impl_formatOutputString( m_nValue ); m_pSpinfieldControl->SetText( aText ); execute( 0 ); } @@ -341,10 +341,10 @@ long SpinfieldToolbarController::PreNotify( NotifyEvent& rNEvt ) void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { - rtl::OUString aValue; - rtl::OUString aMax; - rtl::OUString aMin; - rtl::OUString aStep; + OUString aValue; + OUString aMax; + OUString aMin; + OUString aStep; bool bFloatValue( false ); if ( rControlCommand.Command.equalsAsciiL( "SetStep", 7 )) @@ -357,8 +357,8 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: double fValue; bool bFloat( false ); if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat )) - aStep = bFloat ? ::rtl::OUString::valueOf( fValue ) : - ::rtl::OUString::valueOf( nValue ); + aStep = bFloat ? OUString::valueOf( fValue ) : + OUString::valueOf( nValue ); break; } } @@ -375,7 +375,7 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat )) { - aValue = bFloat ? ::rtl::OUString::valueOf( fValue ) : ::rtl::OUString::valueOf( nValue ); + aValue = bFloat ? OUString::valueOf( fValue ) : OUString::valueOf( nValue ); bFloatValue = bFloat; } break; @@ -390,23 +390,23 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: double fValue; bool bFloat( false ); - rtl::OUString aName = rControlCommand.Arguments[i].Name; + OUString aName = rControlCommand.Arguments[i].Name; if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat )) { if ( aName.equalsAsciiL( "Value", 5 )) { - aValue = bFloat ? ::rtl::OUString::valueOf( fValue ) : ::rtl::OUString::valueOf( nValue ); + aValue = bFloat ? OUString::valueOf( fValue ) : OUString::valueOf( nValue ); bFloatValue = bFloat; } else if ( aName.equalsAsciiL( "Step", 4 )) - aStep = bFloat ? ::rtl::OUString::valueOf( fValue ) : - ::rtl::OUString::valueOf( nValue ); + aStep = bFloat ? OUString::valueOf( fValue ) : + OUString::valueOf( nValue ); else if ( aName.equalsAsciiL( "LowerLimit", 10 )) - aMin = bFloat ? ::rtl::OUString::valueOf( fValue ) : - ::rtl::OUString::valueOf( nValue ); + aMin = bFloat ? OUString::valueOf( fValue ) : + OUString::valueOf( nValue ); else if ( aName.equalsAsciiL( "UpperLimit", 10 )) - aMax = bFloat ? ::rtl::OUString::valueOf( fValue ) : - ::rtl::OUString::valueOf( nValue ); + aMax = bFloat ? OUString::valueOf( fValue ) : + OUString::valueOf( nValue ); } else if ( aName.equalsAsciiL( "OutputFormat", 12 )) rControlCommand.Arguments[i].Value >>= m_aOutFormat; @@ -422,8 +422,8 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: double fValue; bool bFloat( false ); if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat )) - aMin = bFloat ? ::rtl::OUString::valueOf( fValue ) : - ::rtl::OUString::valueOf( nValue ); + aMin = bFloat ? OUString::valueOf( fValue ) : + OUString::valueOf( nValue ); break; } } @@ -438,8 +438,8 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: double fValue; bool bFloat( false ); if ( impl_getValue( rControlCommand.Arguments[i].Value, nValue, fValue, bFloat )) - aMax = bFloat ? ::rtl::OUString::valueOf( fValue ) : - ::rtl::OUString::valueOf( nValue ); + aMax = bFloat ? OUString::valueOf( fValue ) : + OUString::valueOf( nValue ); break; } } @@ -462,7 +462,7 @@ void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star:: m_bFloat = bFloatValue; m_nValue = aValue.toDouble(); - rtl::OUString aOutString = impl_formatOutputString( m_nValue ); + OUString aOutString = impl_formatOutputString( m_nValue ); m_pSpinfieldControl->SetText( aOutString ); notifyTextChanged( aOutString ); } @@ -503,14 +503,14 @@ bool SpinfieldToolbarController::impl_getValue( return bValueValid; } -rtl::OUString SpinfieldToolbarController::impl_formatOutputString( double fValue ) +OUString SpinfieldToolbarController::impl_formatOutputString( double fValue ) { if ( m_aOutFormat.isEmpty() ) { if ( m_bFloat ) - return rtl::OUString::valueOf( fValue ); + return OUString::valueOf( fValue ); else - return rtl::OUString::valueOf( sal_Int32( fValue )); + return OUString::valueOf( sal_Int32( fValue )); } else { @@ -524,7 +524,7 @@ rtl::OUString SpinfieldToolbarController::impl_formatOutputString( double fValue snwprintf( reinterpret_cast<wchar_t *>(aBuffer), 128, reinterpret_cast<const wchar_t *>(m_aOutFormat.getStr()), sal_Int32( fValue )); sal_Int32 nSize = rtl_ustr_getLength( aBuffer ); - return rtl::OUString( aBuffer, nSize ); + return OUString( aBuffer, nSize ); #else // Currently we have no support for a format string using sal_Unicode. wchar_t // is 32 bit on Unix platform! diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index da48fa794bb9..9b1826e52f19 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -111,7 +111,7 @@ DEFINE_XTYPEPROVIDER_5 ( StatusBarManager StatusBarManager::StatusBarManager( const uno::Reference< lang::XMultiServiceFactory >& rServiceManager, const uno::Reference< frame::XFrame >& rFrame, - const rtl::OUString& rResourceName, + const OUString& rResourceName, StatusBar* pStatusBar ) : ThreadHelpBase( &Application::GetSolarMutex() ), OWeakObject(), @@ -316,7 +316,7 @@ void StatusBarManager::RemoveControllers() } } -rtl::OUString StatusBarManager::RetrieveLabelFromCommand( const rtl::OUString& aCmdURL ) +OUString StatusBarManager::RetrieveLabelFromCommand( const OUString& aCmdURL ) { return framework::RetrieveLabelFromCommand(aCmdURL, comphelper::getComponentContext(m_xServiceManager), m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,m_bModuleIdentified,"Name"); } @@ -335,7 +335,7 @@ void StatusBarManager::CreateControllers() if ( nId == 0 ) continue; - rtl::OUString aCommandURL( m_pStatusBar->GetItemCommand( nId )); + OUString aCommandURL( m_pStatusBar->GetItemCommand( nId )); sal_Bool bInit( sal_True ); uno::Reference< frame::XStatusListener > xController; @@ -349,19 +349,19 @@ void StatusBarManager::CreateControllers() uno::Sequence< uno::Any > aSeq( 5 ); beans::PropertyValue aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" )); + aPropValue.Name = OUString( "ModuleName" ); aPropValue.Value = uno::makeAny( m_aModuleIdentifier ); aSeq[0] = uno::makeAny( aPropValue ); - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); + aPropValue.Name = OUString( "Frame" ); aPropValue.Value = uno::makeAny( m_xFrame ); aSeq[1] = uno::makeAny( aPropValue ); - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ServiceManager" )); + aPropValue.Name = OUString( "ServiceManager" ); aPropValue.Value = uno::makeAny( m_xServiceManager ); aSeq[2] = uno::makeAny( aPropValue ); - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )); + aPropValue.Name = OUString( "ParentWindow" ); aPropValue.Value = uno::makeAny( xStatusbarWindow ); aSeq[3] = uno::makeAny( aPropValue ); - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Identifier" )); + aPropValue.Name = OUString( "Identifier" ); aPropValue.Value = uno::makeAny( nId ); aSeq[4] = uno::makeAny( aPropValue ); @@ -394,19 +394,19 @@ void StatusBarManager::CreateControllers() { beans::PropertyValue aPropValue; uno::Sequence< uno::Any > aArgs( 5 ); - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); + aPropValue.Name = OUString( "Frame" ); aPropValue.Value = uno::makeAny( m_xFrame ); aArgs[0] = uno::makeAny( aPropValue ); - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" )); + aPropValue.Name = OUString( "CommandURL" ); aPropValue.Value = uno::makeAny( aCommandURL ); aArgs[1] = uno::makeAny( aPropValue ); - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ServiceManager" )); + aPropValue.Name = OUString( "ServiceManager" ); aPropValue.Value = uno::makeAny( m_xServiceManager ); aArgs[2] = uno::makeAny( aPropValue ); - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )); + aPropValue.Name = OUString( "ParentWindow" ); aPropValue.Value = uno::makeAny( xStatusbarWindow ); aArgs[3] = uno::makeAny( aPropValue ); - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Identifier" )); + aPropValue.Name = OUString( "Identifier" ); aPropValue.Value = uno::makeAny( nId ); aArgs[4] = uno::makeAny( aPropValue ); xInit->initialize( aArgs ); @@ -449,8 +449,8 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::FillStatusBar" ); uno::Sequence< beans::PropertyValue > aProp; - rtl::OUString aCommandURL; - rtl::OUString aHelpURL; + OUString aCommandURL; + OUString aHelpURL; sal_Int16 nOffset( 0 ); sal_Int16 nStyle( 0 ); sal_Int16 nWidth( 0 ); @@ -490,7 +490,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc if (( nType == ::com::sun::star::ui::ItemType::DEFAULT ) && !aCommandURL.isEmpty() ) { - rtl::OUString aString( RetrieveLabelFromCommand( aCommandURL )); + OUString aString( RetrieveLabelFromCommand( aCommandURL )); sal_uInt16 nItemBits( impl_convertItemStyleToItemBits( nStyle )); m_pStatusBar->InsertItem( nId, nWidth, nItemBits, nOffset ); @@ -532,7 +532,7 @@ void StatusBarManager::DataChanged( const DataChangedEvent& rDCEvt ) css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; css::uno::Reference< css::beans::XPropertySet > xPropSet( m_xFrame, css::uno::UNO_QUERY ); if ( xPropSet.is() ) - xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xLayoutManager; + xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xLayoutManager; if ( xLayoutManager.is() ) { aGuard.unlock(); diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index 3389286a226e..619e37aa30f1 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -62,7 +62,7 @@ ToggleButtonToolbarController::ToggleButtonToolbarController( ToolBox* pToolbar, sal_uInt16 nID, Style eStyle, - const ::rtl::OUString& aCommand ) : + const OUString& aCommand ) : ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ), m_eStyle( eStyle ) { @@ -93,9 +93,9 @@ Sequence<PropertyValue> ToggleButtonToolbarController::getExecuteArgs(sal_Int16 Sequence<PropertyValue> aArgs( 2 ); // Add key modifier to argument list - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" )); + aArgs[0].Name = OUString( "KeyModifier" ); aArgs[0].Value <<= KeyModifier; - aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )); + aArgs[1].Name = OUString( "Text" ); aArgs[1].Value <<= m_aCurrentSelection; return aArgs; } @@ -116,7 +116,7 @@ throw (::com::sun::star::uno::RuntimeException) const sal_uInt32 nCount = m_aDropdownMenuList.size(); for ( sal_uInt32 i = 0; i < nCount; i++ ) { - rtl::OUString aLabel( m_aDropdownMenuList[i] ); + OUString aLabel( m_aDropdownMenuList[i] ); aPopup.InsertItem( sal_uInt16( i+1 ), aLabel ); if ( aLabel == m_aCurrentSelection ) aPopup.CheckItem( sal_uInt16( i+1 ), sal_True ); @@ -148,7 +148,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "List", 4 )) { - Sequence< ::rtl::OUString > aList; + Sequence< OUString > aList; m_aDropdownMenuList.clear(); rControlCommand.Arguments[i].Value >>= aList; @@ -157,9 +157,9 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta // send notification uno::Sequence< beans::NamedValue > aInfo( 1 ); - aInfo[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "List" )); + aInfo[0].Name = OUString( "List" ); aInfo[0].Value <<= aList; - addNotifyInfo( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListChanged" )), + addNotifyInfo( OUString( "ListChanged" ), getDispatchFromCommand( m_aCommandURL ), aInfo ); @@ -184,9 +184,9 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta // send notification uno::Sequence< beans::NamedValue > aInfo( 1 ); - aInfo[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ItemChecked" )); + aInfo[0].Name = OUString( "ItemChecked" ); aInfo[0].Value <<= nPos; - addNotifyInfo( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Pos" )), + addNotifyInfo( OUString( "Pos" ), getDispatchFromCommand( m_aCommandURL ), aInfo ); } @@ -196,7 +196,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta } else if ( rControlCommand.Command.equalsAsciiL( "AddEntry", 8 )) { - rtl::OUString aText; + OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) @@ -211,7 +211,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta { sal_Int32 nPos( COMBOBOX_APPEND ); sal_Int32 nSize = sal_Int32( m_aDropdownMenuList.size() ); - rtl::OUString aText; + OUString aText; for ( sal_Int32 i = 0; i < rControlCommand.Arguments.getLength(); i++ ) { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Pos", 3 )) @@ -227,7 +227,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta rControlCommand.Arguments[i].Value >>= aText; } - std::vector< ::rtl::OUString >::iterator aIter = m_aDropdownMenuList.begin(); + std::vector< OUString >::iterator aIter = m_aDropdownMenuList.begin(); aIter += nPos; m_aDropdownMenuList.insert( aIter, aText ); } @@ -242,7 +242,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta { if ( nPos < sal_Int32( m_aDropdownMenuList.size() )) { - std::vector< ::rtl::OUString >::iterator aIter = m_aDropdownMenuList.begin(); + std::vector< OUString >::iterator aIter = m_aDropdownMenuList.begin(); aIter += nPos; m_aDropdownMenuList.erase( aIter ); } @@ -257,7 +257,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta { if ( rControlCommand.Arguments[i].Name.equalsAsciiL( "Text", 4 )) { - rtl::OUString aText; + OUString aText; if ( rControlCommand.Arguments[i].Value >>= aText ) { sal_Int32 nSize = sal_Int32( m_aDropdownMenuList.size() ); @@ -265,7 +265,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta { if ( m_aDropdownMenuList[j] == aText ) { - std::vector< ::rtl::OUString >::iterator aIter = m_aDropdownMenuList.begin(); + std::vector< OUString >::iterator aIter = m_aDropdownMenuList.begin(); aIter += j; m_aDropdownMenuList.erase( aIter ); break; diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 37e76b9c75a6..2cace901bb7a 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -85,12 +85,12 @@ static const char STATIC_INTERNAL_CMD_PART[] = ".cmd:"; namespace framework { -typedef boost::unordered_map< rtl::OUString, rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ToolbarHashMap; +typedef boost::unordered_map< OUString, OUString, OUStringHashCode, ::std::equal_to< OUString > > ToolbarHashMap; struct ToolBarEntry { - rtl::OUString aUIName; - rtl::OUString aCommand; + OUString aUIName; + OUString aCommand; sal_Bool bVisible; sal_Bool bContextSensitive; const CollatorWrapper* pCollatorWrapper; @@ -113,7 +113,7 @@ Reference< XLayoutManager > getLayoutManagerFromFrame( const Reference< XFrame > try { - xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xLayoutManager; + xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xLayoutManager; } catch ( const UnknownPropertyException& ) { @@ -124,8 +124,8 @@ Reference< XLayoutManager > getLayoutManagerFromFrame( const Reference< XFrame > struct ToolBarInfo { - rtl::OUString aToolBarResName; - rtl::OUString aToolBarUIName; + OUString aToolBarResName; + OUString aToolBarUIName; }; DEFINE_XSERVICEINFO_MULTISERVICE ( ToolbarsMenuController , @@ -151,11 +151,11 @@ ToolbarsMenuController::~ToolbarsMenuController() } void ToolbarsMenuController::addCommand( - Reference< css::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OUString& rLabel ) + Reference< css::awt::XPopupMenu >& rPopupMenu, const OUString& rCommandURL, const OUString& rLabel ) { sal_uInt16 nItemId = m_xPopupMenu->getItemCount()+1; - rtl::OUString aLabel; + OUString aLabel; if ( rLabel.isEmpty() ) aLabel = getUINameFromCommand( rCommandURL ); else @@ -191,7 +191,7 @@ void ToolbarsMenuController::addCommand( m_aCommandVector.push_back( rCommandURL ); } -Reference< XDispatch > ToolbarsMenuController::getDispatchFromCommandURL( const rtl::OUString& rCommandURL ) +Reference< XDispatch > ToolbarsMenuController::getDispatchFromCommandURL( const OUString& rCommandURL ) { URL aTargetURL; Sequence<PropertyValue> aArgs; @@ -208,15 +208,15 @@ Reference< XDispatch > ToolbarsMenuController::getDispatchFromCommandURL( const xURLTransformer->parseStrict( aTargetURL ); Reference< XDispatchProvider > xDispatchProvider( xFrame, UNO_QUERY ); if ( xDispatchProvider.is() ) - return xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + return xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); else return Reference< XDispatch >(); } // private function -rtl::OUString ToolbarsMenuController::getUINameFromCommand( const rtl::OUString& rCommandURL ) +OUString ToolbarsMenuController::getUINameFromCommand( const OUString& rCommandURL ) { - rtl::OUString aLabel; + OUString aLabel; if ( !m_bModuleIdentified ) { @@ -237,7 +237,7 @@ rtl::OUString ToolbarsMenuController::getUINameFromCommand( const rtl::OUString& try { Sequence< PropertyValue > aPropSeq; - rtl::OUString aStr; + OUString aStr; if ( m_xUICommandDescription->getByName( rCommandURL ) >>= aPropSeq ) { for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) @@ -264,8 +264,8 @@ static void fillHashMap( const Sequence< Sequence< ::com::sun::star::beans::Prop { for ( sal_Int32 i = 0; i < rSeqToolBars.getLength(); i++ ) { - rtl::OUString aResourceURL; - rtl::OUString aUIName; + OUString aResourceURL; + OUString aUIName; const PropertyValue* pProperties = rSeqToolBars[i].getConstArray(); for ( sal_Int32 j = 0; j < rSeqToolBars[i].getLength(); j++ ) { @@ -294,10 +294,10 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl { try { - rtl::OUString aResName; + OUString aResName; sal_Int16 nType( -1 ); - xPropSet->getPropertyValue( rtl::OUString( "Type" )) >>= nType; - xPropSet->getPropertyValue( rtl::OUString( "ResourceURL" )) >>= aResName; + xPropSet->getPropertyValue( OUString( "Type" )) >>= nType; + xPropSet->getPropertyValue( OUString( "ResourceURL" )) >>= aResName; if (( nType == ::com::sun::star::ui::UIElementType::TOOLBAR ) && !aResName.isEmpty() ) @@ -353,7 +353,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r m_aCommandVector.clear(); // Retrieve layout manager for additional information - rtl::OUString aEmptyString; + OUString aEmptyString; Reference< awt::XMenuExtended > xMenuExtended( rPopupMenu, UNO_QUERY ); Reference< XLayoutManager > xLayoutManager( getLayoutManagerFromFrame( m_xFrame )); @@ -377,7 +377,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r } std::vector< ToolBarEntry > aSortedTbs; - rtl::OUString aStaticCmdPart( STATIC_CMD_PART ); + OUString aStaticCmdPart( STATIC_CMD_PART ); Sequence< Sequence< com::sun::star::beans::PropertyValue > > aSeqFrameToolBars = getLayoutManagerToolbars( xLayoutManager ); fillHashMap( aSeqFrameToolBars, aToolbarHashMap ); @@ -385,7 +385,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r ToolbarHashMap::const_iterator pIter = aToolbarHashMap.begin(); while ( pIter != aToolbarHashMap.end() ) { - rtl::OUString aUIName = pIter->second; + OUString aUIName = pIter->second; sal_Bool bHideFromMenu( sal_False ); sal_Bool bContextSensitive( sal_False ); sal_Bool bVisible( sal_False ); @@ -456,13 +456,13 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r } // use VCL popup menu pointer to set vital information that are not part of the awt implementation - rtl::OUStringBuffer aStrBuf( aStaticCmdPart ); + OUStringBuffer aStrBuf( aStaticCmdPart ); sal_Int32 n = aSortedTbs[i].aCommand.lastIndexOf( '/' ); if (( n > 0 ) && (( n+1 ) < aSortedTbs[i].aCommand.getLength() )) aStrBuf.append( aSortedTbs[i].aCommand.copy( n+1 )); - rtl::OUString aCmd( aStrBuf.makeStringAndClear() ); + OUString aCmd( aStrBuf.makeStringAndClear() ); // Store complete uno-command so it can also be dispatched. This is necessary to support // the test tool! @@ -480,21 +480,21 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r { if ( m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) || m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) )) - addCommand( m_xPopupMenu, rtl::OUString( CMD_COLORBAR ), aEmptyString ); + addCommand( m_xPopupMenu, OUString( CMD_COLORBAR ), aEmptyString ); else if ( m_aModuleIdentifier == "com.sun.star.sheet.SpreadsheetDocument" ) - addCommand( m_xPopupMenu, rtl::OUString( CMD_INPUTLINEBAR ), aEmptyString ); + addCommand( m_xPopupMenu, OUString( CMD_INPUTLINEBAR ), aEmptyString ); else - addCommand( m_xPopupMenu, rtl::OUString( CMD_FORMULABAR ), aEmptyString ); + addCommand( m_xPopupMenu, OUString( CMD_FORMULABAR ), aEmptyString ); } sal_Bool bAddCommand( sal_True ); SvtCommandOptions aCmdOptions; - rtl::OUString aConfigureToolbar( CONFIGURE_TOOLBARS ); + OUString aConfigureToolbar( CONFIGURE_TOOLBARS ); if ( aCmdOptions.HasEntries( SvtCommandOptions::CMDOPTION_DISABLED )) { if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, - rtl::OUString( CONFIGURE_TOOLBARS_CMD ))) + OUString( CONFIGURE_TOOLBARS_CMD ))) bAddCommand = sal_False; } @@ -522,7 +522,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r } String aLabelStr = String( FwkResId( STR_RESTORE_TOOLBARS )); - rtl::OUString aRestoreCmd( CMD_RESTOREVISIBILITY ); + OUString aRestoreCmd( CMD_RESTOREVISIBILITY ); addCommand( m_xPopupMenu, aRestoreCmd, aLabelStr ); } } @@ -547,7 +547,7 @@ void SAL_CALL ToolbarsMenuController::disposing( const EventObject& ) throw ( Ru // XStatusListener void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) { - rtl::OUString aFeatureURL( Event.FeatureURL.Complete ); + OUString aFeatureURL( Event.FeatureURL.Complete ); // All other status events will be processed here sal_Bool bSetCheckmark = sal_False; @@ -569,7 +569,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev if ( nId == 0 ) continue; - rtl::OUString aCmd = pVCLPopupMenu->GetItemCommand( nId ); + OUString aCmd = pVCLPopupMenu->GetItemCommand( nId ); if ( aCmd == aFeatureURL ) { // Enable/disable item @@ -583,7 +583,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev pVCLPopupMenu->CheckItem( nId, bCheckmark ); else { - rtl::OUString aItemText; + OUString aItemText; if ( Event.State >>= aItemText ) pVCLPopupMenu->SetItemText( nId, aItemText ); @@ -618,7 +618,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent SolarMutexGuard aSolarMutexGuard; PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); - rtl::OUString aCmd( pVCLPopupMenu->GetItemCommand( rEvent.MenuId )); + OUString aCmd( pVCLPopupMenu->GetItemCommand( rEvent.MenuId )); if ( aCmd.indexOf( STATIC_INTERNAL_CMD_PART ) == 0 ) { // Command to restore the visibility of all context sensitive toolbars @@ -627,7 +627,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent { try { - Sequence< rtl::OUString > aElementNames = xPersistentWindowState->getElementNames(); + Sequence< OUString > aElementNames = xPersistentWindowState->getElementNames(); sal_Int32 nCount = aElementNames.getLength(); bool bRefreshToolbars( false ); @@ -635,7 +635,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent { try { - rtl::OUString aElementName = aElementNames[i]; + OUString aElementName = aElementNames[i]; Sequence< PropertyValue > aWindowState; if ( xPersistentWindowState->getByName( aElementName ) >>= aWindowState ) @@ -678,7 +678,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent { try { - xPropSet->setPropertyValue( rtl::OUString( "RefreshContextToolbarVisibility" ), makeAny( sal_True )); + xPropSet->setPropertyValue( OUString( "RefreshContextToolbarVisibility" ), makeAny( sal_True )); } catch ( const RuntimeException& ) { @@ -711,7 +711,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent if ( xDispatchProvider.is() ) { Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( - aTargetURL, ::rtl::OUString(), 0 ); + aTargetURL, OUString(), 0 ); ExecuteInfo* pExecuteInfo = new ExecuteInfo; pExecuteInfo->xDispatch = xDispatch; @@ -729,11 +729,11 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent sal_Int32 nIndex = aCmd.indexOf( '=' ); if (( nIndex > 0 ) && (( nIndex+1 ) < aCmd.getLength() )) { - rtl::OUStringBuffer aBuf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STATIC_PRIVATE_TB_RESOURCE ))); + OUStringBuffer aBuf( OUString( RTL_CONSTASCII_USTRINGPARAM( STATIC_PRIVATE_TB_RESOURCE) )); aBuf.append( aCmd.copy( nIndex+1 )); sal_Bool bShow( !pVCLPopupMenu->IsItemChecked( rEvent.MenuId )); - rtl::OUString aToolBarResName( aBuf.makeStringAndClear() ); + OUString aToolBarResName( aBuf.makeStringAndClear() ); if ( bShow ) { xLayoutManager->createElement( aToolBarResName ); @@ -755,7 +755,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent void SAL_CALL ToolbarsMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException) { - std::vector< rtl::OUString > aCmdVector; + std::vector< OUString > aCmdVector; Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); Reference< XURLTransformer > xURLTransformer( m_xURLTransformer ); { @@ -775,7 +775,7 @@ void SAL_CALL ToolbarsMenuController::activate( const css::awt::MenuEvent& ) thr URL aTargetURL; aTargetURL.Complete = aCmdVector[i]; xURLTransformer->parseStrict( aTargetURL ); - Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); if ( xDispatch.is() ) { xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL ); @@ -826,7 +826,7 @@ void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArgume Reference< XNameAccess > xPersistentWindowStateSupplier = ::com::sun::star::ui::WindowStateConfiguration::create( comphelper::getComponentContext(m_xServiceManager) ); // Retrieve persistent window state reference for our module - rtl::OUString aModuleIdentifier; + OUString aModuleIdentifier; try { aModuleIdentifier = xModuleManager->identify( m_xFrame ); diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx index 24f2cb5ac48a..823ca67e89b3 100644 --- a/framework/source/uifactory/addonstoolboxfactory.cxx +++ b/framework/source/uifactory/addonstoolboxfactory.cxx @@ -71,7 +71,7 @@ AddonsToolBoxFactory::~AddonsToolBoxFactory() { } -static sal_Bool IsCorrectContext( const ::rtl::OUString& rModuleIdentifier, const rtl::OUString& aContextList ) +static sal_Bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString& aContextList ) { if ( aContextList.isEmpty() ) return sal_True; @@ -89,7 +89,7 @@ sal_Bool AddonsToolBoxFactory::hasButtonsInContext( const Sequence< Sequence< PropertyValue > >& rPropSeqSeq, const Reference< XFrame >& rFrame ) { - ::rtl::OUString aModuleIdentifier; + OUString aModuleIdentifier; try { aModuleIdentifier = m_xModuleManager->identify( rFrame ); @@ -115,14 +115,14 @@ sal_Bool AddonsToolBoxFactory::hasButtonsInContext( { if ( rPropSeq[j].Name.equalsAsciiL( "Context", 7 )) { - ::rtl::OUString aContextList; + OUString aContextList; if ( rPropSeq[j].Value >>= aContextList ) bIsCorrectContext = IsCorrectContext( aModuleIdentifier, aContextList ); nPropChecked++; } else if ( rPropSeq[j].Name.equalsAsciiL( "URL", 3 )) { - ::rtl::OUString aURL; + OUString aURL; rPropSeq[j].Value >>= aURL; bIsButton = !aURL.equalsAsciiL( "private:separator", 17 ); nPropChecked++; @@ -141,7 +141,7 @@ sal_Bool AddonsToolBoxFactory::hasButtonsInContext( // XUIElementFactory Reference< XUIElement > SAL_CALL AddonsToolBoxFactory::createUIElement( - const ::rtl::OUString& ResourceURL, + const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, @@ -152,7 +152,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, Sequence< Sequence< PropertyValue > > aConfigData; Reference< XFrame > xFrame; - rtl::OUString aResourceURL( ResourceURL ); + OUString aResourceURL( ResourceURL ); for ( sal_Int32 n = 0; n < Args.getLength(); n++ ) { @@ -175,13 +175,13 @@ throw ( ::com::sun::star::container::NoSuchElementException, { PropertyValue aPropValue; Sequence< Any > aPropSeq( 3 ); - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); + aPropValue.Name = OUString( "Frame" ); aPropValue.Value <<= xFrame; aPropSeq[0] <<= aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationData" )); + aPropValue.Name = OUString( "ConfigurationData" ); aPropValue.Value <<= aConfigData; aPropSeq[1] <<= aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" )); + aPropValue.Name = OUString( "ResourceURL" ); aPropValue.Value <<= aResourceURL; aPropSeq[2] <<= aPropValue; diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index 50f736ca8258..759de8d5c68e 100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -50,9 +50,9 @@ using namespace ::com::sun::star::frame; namespace framework { -rtl::OUString getHashKeyFromStrings( const rtl::OUString& aCommandURL, const rtl::OUString& aModuleName ) +OUString getHashKeyFromStrings( const OUString& aCommandURL, const OUString& aModuleName ) { - rtl::OUStringBuffer aKey( aCommandURL ); + OUStringBuffer aKey( aCommandURL ); aKey.appendAscii( "-" ); aKey.append( aModuleName ); return aKey.makeStringAndClear(); @@ -61,12 +61,12 @@ rtl::OUString getHashKeyFromStrings( const rtl::OUString& aCommandURL, const rtl //***************************************************************************************************************** // XInterface, XTypeProvider //***************************************************************************************************************** -ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( const Reference< XComponentContext >& rxContext, const ::rtl::OUString& _sRoot,bool _bAskValue ) : +ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( const Reference< XComponentContext >& rxContext, const OUString& _sRoot,bool _bAskValue ) : ThreadHelpBase(), - m_aPropCommand( RTL_CONSTASCII_USTRINGPARAM( "Command" )), - m_aPropModule( RTL_CONSTASCII_USTRINGPARAM( "Module" )), - m_aPropController( RTL_CONSTASCII_USTRINGPARAM( "Controller" )), - m_aPropValue( RTL_CONSTASCII_USTRINGPARAM( "Value" )), + m_aPropCommand( "Command" ), + m_aPropModule( "Module" ), + m_aPropController( "Controller" ), + m_aPropValue( "Value" ), m_sRoot(_sRoot), m_bConfigAccessInitialized( sal_False ), m_bAskValue(_bAskValue) @@ -85,7 +85,7 @@ ConfigurationAccess_ControllerFactory::~ConfigurationAccess_ControllerFactory() xContainer->removeContainerListener(m_xConfigAccessListener); } -rtl::OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const +OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::getServiceFromCommandModule" ); // SAFE @@ -97,15 +97,15 @@ rtl::OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule else if ( !rModule.isEmpty() ) { // Try to detect if we have a generic popup menu controller - pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rtl::OUString() )); + pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, OUString() )); if ( pIter != m_aMenuControllerMap.end() ) return pIter->second.m_aImplementationName; } - return rtl::OUString(); + return OUString(); } -rtl::OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const +OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::getValueFromCommandModule" ); // SAFE @@ -118,38 +118,38 @@ rtl::OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( else if ( !rModule.isEmpty() ) { // Try to detect if we have a generic popup menu controller - pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rtl::OUString() )); + pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, OUString() )); if ( pIter != m_aMenuControllerMap.end() ) return pIter->second.m_aValue; } - return rtl::OUString(); + return OUString(); } void ConfigurationAccess_ControllerFactory::addServiceToCommandModule( - const rtl::OUString& rCommandURL, - const rtl::OUString& rModule, - const rtl::OUString& rServiceSpecifier ) + const OUString& rCommandURL, + const OUString& rModule, + const OUString& rServiceSpecifier ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::addServiceToCommandModule" ); // SAFE ResetableGuard aLock( m_aLock ); - rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule ); - m_aMenuControllerMap.insert( MenuControllerMap::value_type( aHashKey,ControllerInfo(rServiceSpecifier,::rtl::OUString()) )); + OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule ); + m_aMenuControllerMap.insert( MenuControllerMap::value_type( aHashKey,ControllerInfo(rServiceSpecifier,OUString()) )); } void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule( - const rtl::OUString& rCommandURL, - const rtl::OUString& rModule ) + const OUString& rCommandURL, + const OUString& rModule ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule" ); // SAFE ResetableGuard aLock( m_aLock ); - rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule ); + OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule ); m_aMenuControllerMap.erase( aHashKey ); } @@ -157,10 +157,10 @@ void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule( void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::elementInserted" ); - rtl::OUString aCommand; - rtl::OUString aModule; - rtl::OUString aService; - rtl::OUString aValue; + OUString aCommand; + OUString aModule; + OUString aService; + OUString aValue; // SAFE ResetableGuard aLock( m_aLock ); @@ -169,7 +169,7 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const Cont { // Create hash key from command and module as they are together a primary key to // the UNO service that implements the popup menu controller. - rtl::OUString aHashKey( getHashKeyFromStrings( aCommand, aModule )); + OUString aHashKey( getHashKeyFromStrings( aCommand, aModule )); ControllerInfo& rControllerInfo = m_aMenuControllerMap[ aHashKey ]; rControllerInfo.m_aImplementationName = aService; rControllerInfo.m_aValue = aValue; @@ -179,10 +179,10 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const Cont void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::elementRemoved" ); - rtl::OUString aCommand; - rtl::OUString aModule; - rtl::OUString aService; - rtl::OUString aValue; + OUString aCommand; + OUString aModule; + OUString aService; + OUString aValue; // SAFE ResetableGuard aLock( m_aLock ); @@ -191,7 +191,7 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const Cont { // Create hash key from command and module as they are together a primary key to // the UNO service that implements the popup menu controller. - rtl::OUString aHashKey( getHashKeyFromStrings( aCommand, aModule )); + OUString aHashKey( getHashKeyFromStrings( aCommand, aModule )); m_aMenuControllerMap.erase( aHashKey ); } } @@ -223,7 +223,7 @@ void ConfigurationAccess_ControllerFactory::readConfigurationData() Sequence< Any > aArgs( 1 ); PropertyValue aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" )); + aPropValue.Name = OUString( "nodepath" ); aPropValue.Value <<= m_sRoot; aArgs[0] <<= aPropValue; @@ -262,13 +262,13 @@ void ConfigurationAccess_ControllerFactory::updateConfigurationData() ResetableGuard aLock( m_aLock ); if ( m_xConfigAccess.is() ) { - Sequence< rtl::OUString > aPopupMenuControllers = m_xConfigAccess->getElementNames(); + Sequence< OUString > aPopupMenuControllers = m_xConfigAccess->getElementNames(); - rtl::OUString aCommand; - rtl::OUString aModule; - rtl::OUString aService; - rtl::OUString aHashKey; - rtl::OUString aValue; + OUString aCommand; + OUString aModule; + OUString aService; + OUString aHashKey; + OUString aValue; m_aMenuControllerMap.clear(); for ( sal_Int32 i = 0; i < aPopupMenuControllers.getLength(); i++ ) @@ -293,7 +293,7 @@ void ConfigurationAccess_ControllerFactory::updateConfigurationData() } } -sal_Bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any& aElement, rtl::OUString& aCommand, rtl::OUString& aModule, rtl::OUString& aServiceSpecifier,rtl::OUString& aValue ) const +sal_Bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::impl_getElementProps" ); Reference< XPropertySet > xPropertySet; diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx index 53670710d475..6cf90ce300e8 100644 --- a/framework/source/uifactory/menubarfactory.cxx +++ b/framework/source/uifactory/menubarfactory.cxx @@ -81,7 +81,7 @@ MenuBarFactory::~MenuBarFactory() // XUIElementFactory Reference< XUIElement > SAL_CALL MenuBarFactory::createUIElement( - const ::rtl::OUString& ResourceURL, + const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) { @@ -94,7 +94,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l CreateUIElement(ResourceURL,Args,"MenuOnly","private:resource/menubar/",xMenuBar,xModuleManager, comphelper::getComponentContext(m_xServiceManager)); return xMenuBar; } -void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL +void MenuBarFactory::CreateUIElement(const OUString& ResourceURL , const Sequence< PropertyValue >& Args ,const char* _pExtraMode ,const char* _pAsciiName @@ -105,7 +105,7 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL Reference< XUIConfigurationManager > xCfgMgr; Reference< XUIConfigurationManager > xConfigSource; Reference< XFrame > xFrame; - rtl::OUString aResourceURL( ResourceURL ); + OUString aResourceURL( ResourceURL ); sal_Bool bPersistent( sal_True ); sal_Bool bExtraMode( sal_False ); @@ -122,7 +122,7 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL else if ( _pExtraMode && Args[n].Name.equalsAscii( _pExtraMode )) Args[n].Value >>= bExtraMode; } - if ( aResourceURL.indexOf( rtl::OUString::createFromAscii(_pAsciiName)) != 0 ) + if ( aResourceURL.indexOf( OUString::createFromAscii(_pAsciiName)) != 0 ) throw IllegalArgumentException(); // Identify frame and determine document based ui configuration manager/module ui configuration manager @@ -147,7 +147,7 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL if ( !bHasSettings ) { - rtl::OUString aModuleIdentifier = _xModuleManager->identify( Reference< XInterface >( xFrame, UNO_QUERY )); + OUString aModuleIdentifier = _xModuleManager->identify( Reference< XInterface >( xFrame, UNO_QUERY )); if ( !aModuleIdentifier.isEmpty() ) { Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier = @@ -160,21 +160,21 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL PropertyValue aPropValue; Sequence< Any > aPropSeq( _pExtraMode ? 5 : 4); - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); + aPropValue.Name = OUString( "Frame" ); aPropValue.Value <<= xFrame; aPropSeq[0] <<= aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" )); + aPropValue.Name = OUString( "ConfigurationSource" ); aPropValue.Value <<= xCfgMgr; aPropSeq[1] <<= aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" )); + aPropValue.Name = OUString( "ResourceURL" ); aPropValue.Value <<= aResourceURL; aPropSeq[2] <<= aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" )); + aPropValue.Name = OUString( "Persistent" ); aPropValue.Value <<= bPersistent; aPropSeq[3] <<= aPropValue; if ( _pExtraMode ) { - aPropValue.Name = rtl::OUString::createFromAscii(_pExtraMode); + aPropValue.Name = OUString::createFromAscii(_pExtraMode); aPropValue.Value <<= bExtraMode; aPropSeq[4] <<= aPropValue; } diff --git a/framework/source/uifactory/popupmenucontrollerfactory.cxx b/framework/source/uifactory/popupmenucontrollerfactory.cxx index 90a58477a9b2..e49e346a9507 100644 --- a/framework/source/uifactory/popupmenucontrollerfactory.cxx +++ b/framework/source/uifactory/popupmenucontrollerfactory.cxx @@ -64,7 +64,7 @@ PopupMenuControllerFactory::PopupMenuControllerFactory( const Reference< XMultiS ToolbarControllerFactory(xServiceManager,true) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PopupMenuControllerFactory::PopupMenuControllerFactory" ); - m_pConfigAccess = new ConfigurationAccess_ControllerFactory( comphelper::getComponentContext(m_xServiceManager), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Controller/Registered/PopupMenu" )) ); + m_pConfigAccess = new ConfigurationAccess_ControllerFactory( comphelper::getComponentContext(m_xServiceManager), OUString( "/org.openoffice.Office.UI.Controller/Registered/PopupMenu" ) ); m_pConfigAccess->acquire(); } diff --git a/framework/source/uifactory/statusbarcontrollerfactory.cxx b/framework/source/uifactory/statusbarcontrollerfactory.cxx index b0e0342f3e94..3496d170577e 100644 --- a/framework/source/uifactory/statusbarcontrollerfactory.cxx +++ b/framework/source/uifactory/statusbarcontrollerfactory.cxx @@ -61,7 +61,7 @@ DEFINE_INIT_SERVICE ( StatusbarControllerFactory, {} ) StatusbarControllerFactory::StatusbarControllerFactory( const Reference< XMultiServiceFactory >& xServiceManager ) : ToolbarControllerFactory(xServiceManager,true) { - m_pConfigAccess = new ConfigurationAccess_ControllerFactory( comphelper::getComponentContext(m_xServiceManager), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Controller/Registered/StatusBar" )),true ); + m_pConfigAccess = new ConfigurationAccess_ControllerFactory( comphelper::getComponentContext(m_xServiceManager), OUString( "/org.openoffice.Office.UI.Controller/Registered/StatusBar" ),true ); m_pConfigAccess->acquire(); } diff --git a/framework/source/uifactory/toolbarcontrollerfactory.cxx b/framework/source/uifactory/toolbarcontrollerfactory.cxx index 91cefa24f44a..76c23060f3cd 100644 --- a/framework/source/uifactory/toolbarcontrollerfactory.cxx +++ b/framework/source/uifactory/toolbarcontrollerfactory.cxx @@ -64,7 +64,7 @@ ToolbarControllerFactory::ToolbarControllerFactory( const Reference< XMultiServi m_bConfigRead( sal_False ), m_xServiceManager( xServiceManager ) { - m_pConfigAccess = new ConfigurationAccess_ControllerFactory( comphelper::getComponentContext(m_xServiceManager), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Controller/Registered/ToolBar" )) ); + m_pConfigAccess = new ConfigurationAccess_ControllerFactory( comphelper::getComponentContext(m_xServiceManager), OUString( "/org.openoffice.Office.UI.Controller/Registered/ToolBar" ) ); m_pConfigAccess->acquire(); } @@ -86,7 +86,7 @@ ToolbarControllerFactory::~ToolbarControllerFactory() // XMultiComponentFactory Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithContext( - const ::rtl::OUString& aServiceSpecifier, + const OUString& aServiceSpecifier, const Reference< XComponentContext >& ) throw (Exception, RuntimeException) { @@ -99,7 +99,7 @@ throw (Exception, RuntimeException) m_pConfigAccess->readConfigurationData(); } - rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( aServiceSpecifier, rtl::OUString() ); + OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( aServiceSpecifier, OUString() ); if ( !aServiceName.isEmpty() ) return m_xServiceManager->createInstance( aServiceName ); else @@ -108,15 +108,15 @@ throw (Exception, RuntimeException) } Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithArgumentsAndContext( - const ::rtl::OUString& ServiceSpecifier, + const OUString& ServiceSpecifier, const Sequence< Any >& Arguments, const Reference< XComponentContext >& ) throw (Exception, RuntimeException) { - const rtl::OUString aPropModuleName( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" )); - const rtl::OUString aPropValueName( RTL_CONSTASCII_USTRINGPARAM( "Value" )); + const OUString aPropModuleName( "ModuleName" ); + const OUString aPropValueName( "Value" ); - rtl::OUString aPropName; + OUString aPropName; PropertyValue aPropValue; // Retrieve the optional module name form the Arguments sequence. It is used as a part of @@ -139,7 +139,7 @@ throw (Exception, RuntimeException) // Append the command URL to the Arguments sequence so that one controller can be // used for more than one command URL. - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" )); + aPropValue.Name = OUString( "CommandURL" ); aPropValue.Value <<= ServiceSpecifier; aNewArgs[nAppendIndex] <<= aPropValue; @@ -147,7 +147,7 @@ throw (Exception, RuntimeException) { // Append the optional value argument. It's an empty string if no additional info // is provided to the controller. - rtl::OUString aValue = m_pConfigAccess->getValueFromCommandModule( ServiceSpecifier, aPropName ); + OUString aValue = m_pConfigAccess->getValueFromCommandModule( ServiceSpecifier, aPropName ); aPropValue.Name = aPropValueName; aPropValue.Value <<= aValue; aNewArgs[nAppendIndex+1] <<= aPropValue; @@ -163,7 +163,7 @@ throw (Exception, RuntimeException) m_pConfigAccess->readConfigurationData(); } - rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( ServiceSpecifier, aPropName ); + OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( ServiceSpecifier, aPropName ); Reference< XMultiServiceFactory > xServiceManager( m_xServiceManager ); aLock.unlock(); @@ -177,16 +177,16 @@ throw (Exception, RuntimeException) } } -Sequence< ::rtl::OUString > SAL_CALL ToolbarControllerFactory::getAvailableServiceNames() +Sequence< OUString > SAL_CALL ToolbarControllerFactory::getAvailableServiceNames() throw (RuntimeException) { - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); } // XUIControllerRegistration sal_Bool SAL_CALL ToolbarControllerFactory::hasController( - const ::rtl::OUString& aCommandURL, - const rtl::OUString& aModuleName ) + const OUString& aCommandURL, + const OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aLock( m_aLock ); @@ -201,9 +201,9 @@ throw (::com::sun::star::uno::RuntimeException) } void SAL_CALL ToolbarControllerFactory::registerController( - const ::rtl::OUString& aCommandURL, - const ::rtl::OUString& aModuleName, - const ::rtl::OUString& aControllerImplementationName ) + const OUString& aCommandURL, + const OUString& aModuleName, + const OUString& aControllerImplementationName ) throw (RuntimeException) { // SAFE @@ -220,8 +220,8 @@ throw (RuntimeException) } void SAL_CALL ToolbarControllerFactory::deregisterController( - const ::rtl::OUString& aCommandURL, - const rtl::OUString& aModuleName ) + const OUString& aCommandURL, + const OUString& aModuleName ) throw (RuntimeException) { // SAFE diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index dd366b7ca760..8669247b9b86 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -59,9 +59,9 @@ namespace framework { // global function needed by both implementations -rtl::OUString getHashKeyFromStrings( const rtl::OUString& aType, const rtl::OUString& aName, const rtl::OUString& aModuleName ) +OUString getHashKeyFromStrings( const OUString& aType, const OUString& aName, const OUString& aModuleName ) { - rtl::OUStringBuffer aKey( aType ); + OUStringBuffer aKey( aType ); aKey.appendAscii( "^" ); aKey.append( aName ); aKey.appendAscii( "^" ); @@ -75,12 +75,12 @@ rtl::OUString getHashKeyFromStrings( const rtl::OUString& aType, const rtl::OUSt //***************************************************************************************************************** -ConfigurationAccess_FactoryManager::ConfigurationAccess_FactoryManager( const Reference< XComponentContext >& rxContext, const ::rtl::OUString& _sRoot ) : +ConfigurationAccess_FactoryManager::ConfigurationAccess_FactoryManager( const Reference< XComponentContext >& rxContext, const OUString& _sRoot ) : ThreadHelpBase(), - m_aPropType( RTL_CONSTASCII_USTRINGPARAM( "Type" )), - m_aPropName( RTL_CONSTASCII_USTRINGPARAM( "Name" )), - m_aPropModule( RTL_CONSTASCII_USTRINGPARAM( "Module" )), - m_aPropFactory( RTL_CONSTASCII_USTRINGPARAM( "FactoryImplementation" )), + m_aPropType( "Type" ), + m_aPropName( "Name" ), + m_aPropModule( "Module" ), + m_aPropFactory( "FactoryImplementation" ), m_sRoot(_sRoot), m_bConfigAccessInitialized( sal_False ) { @@ -98,7 +98,7 @@ ConfigurationAccess_FactoryManager::~ConfigurationAccess_FactoryManager() xContainer->removeContainerListener(m_xConfigListener); } -rtl::OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule ) const +OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getFactorySpecifierFromTypeNameModule" ); // SAFE @@ -110,7 +110,7 @@ rtl::OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNam return pIter->second; else { - pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, rName, rtl::OUString() )); + pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, rName, OUString() )); if ( pIter != m_aFactoryManagerMap.end() ) return pIter->second; else @@ -119,28 +119,28 @@ rtl::OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNam sal_Int32 nIndex = rName.indexOf( '_' ); if ( nIndex > 0 ) { - rtl::OUString aName = rName.copy( 0, nIndex+1 ); - pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, aName, rtl::OUString() )); + OUString aName = rName.copy( 0, nIndex+1 ); + pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, aName, OUString() )); if ( pIter != m_aFactoryManagerMap.end() ) return pIter->second; } - pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, rtl::OUString(), rtl::OUString() )); + pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, OUString(), OUString() )); if ( pIter != m_aFactoryManagerMap.end() ) return pIter->second; } } - return rtl::OUString(); + return OUString(); } -void ConfigurationAccess_FactoryManager::addFactorySpecifierToTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule, const rtl::OUString& rServiceSpecifier ) +void ConfigurationAccess_FactoryManager::addFactorySpecifierToTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule, const OUString& rServiceSpecifier ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::addFactorySpecifierToTypeNameModule" ); // SAFE ResetableGuard aLock( m_aLock ); - rtl::OUString aHashKey = getHashKeyFromStrings( rType, rName, rModule ); + OUString aHashKey = getHashKeyFromStrings( rType, rName, rModule ); FactoryManagerMap::const_iterator pIter = m_aFactoryManagerMap.find( aHashKey ); @@ -151,13 +151,13 @@ void ConfigurationAccess_FactoryManager::addFactorySpecifierToTypeNameModule( co } -void ConfigurationAccess_FactoryManager::removeFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule ) +void ConfigurationAccess_FactoryManager::removeFactorySpecifierFromTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::removeFactorySpecifierFromTypeNameModule" ); // SAFE ResetableGuard aLock( m_aLock ); - rtl::OUString aHashKey = getHashKeyFromStrings( rType, rName, rModule ); + OUString aHashKey = getHashKeyFromStrings( rType, rName, rModule ); FactoryManagerMap::const_iterator pIter = m_aFactoryManagerMap.find( aHashKey ); @@ -179,7 +179,7 @@ Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFac FactoryManagerMap::const_iterator pIter = m_aFactoryManagerMap.begin(); while ( pIter != m_aFactoryManagerMap.end() ) { - rtl::OUString aFactory = pIter->first; + OUString aFactory = pIter->first; if ( !aFactory.isEmpty() ) { sal_Int32 nToken = 0; @@ -214,10 +214,10 @@ Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFac void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::elementInserted" ); - rtl::OUString aType; - rtl::OUString aName; - rtl::OUString aModule; - rtl::OUString aService; + OUString aType; + OUString aName; + OUString aModule; + OUString aService; // SAFE ResetableGuard aLock( m_aLock ); @@ -226,7 +226,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const Contain { // Create hash key from type, name and module as they are together a primary key to // the UNO service that implements a user interface factory. - rtl::OUString aHashKey( getHashKeyFromStrings( aType, aName, aModule )); + OUString aHashKey( getHashKeyFromStrings( aType, aName, aModule )); m_aFactoryManagerMap.insert( FactoryManagerMap::value_type( aHashKey, aService )); } } @@ -234,10 +234,10 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const Contain void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::elementRemoved " ); - rtl::OUString aType; - rtl::OUString aName; - rtl::OUString aModule; - rtl::OUString aService; + OUString aType; + OUString aName; + OUString aModule; + OUString aService; // SAFE ResetableGuard aLock( m_aLock ); @@ -246,7 +246,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const Contain { // Create hash key from command and model as they are together a primary key to // the UNO service that implements the popup menu controller. - rtl::OUString aHashKey( getHashKeyFromStrings( aType, aName, aModule )); + OUString aHashKey( getHashKeyFromStrings( aType, aName, aModule )); m_aFactoryManagerMap.erase( aHashKey ); } } @@ -254,10 +254,10 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const Contain void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::elementReplaced" ); - rtl::OUString aType; - rtl::OUString aName; - rtl::OUString aModule; - rtl::OUString aService; + OUString aType; + OUString aName; + OUString aModule; + OUString aService; // SAFE ResetableGuard aLock( m_aLock ); @@ -266,7 +266,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const Contain { // Create hash key from command and model as they are together a primary key to // the UNO service that implements the popup menu controller. - rtl::OUString aHashKey( getHashKeyFromStrings( aType, aName, aModule )); + OUString aHashKey( getHashKeyFromStrings( aType, aName, aModule )); m_aFactoryManagerMap.erase( aHashKey ); m_aFactoryManagerMap.insert( FactoryManagerMap::value_type( aHashKey, aService )); } @@ -293,7 +293,7 @@ void ConfigurationAccess_FactoryManager::readConfigurationData() Sequence< Any > aArgs( 1 ); PropertyValue aPropValue; - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" )); + aPropValue.Name = OUString( "nodepath" ); aPropValue.Value <<= m_sRoot; aArgs[0] <<= aPropValue; @@ -310,13 +310,13 @@ void ConfigurationAccess_FactoryManager::readConfigurationData() if ( m_xConfigAccess.is() ) { - Sequence< rtl::OUString > aUIElementFactories = m_xConfigAccess->getElementNames(); + Sequence< OUString > aUIElementFactories = m_xConfigAccess->getElementNames(); - rtl::OUString aType; - rtl::OUString aName; - rtl::OUString aModule; - rtl::OUString aService; - rtl::OUString aHashKey; + OUString aType; + OUString aName; + OUString aModule; + OUString aService; + OUString aHashKey; Reference< XPropertySet > xPropertySet; for ( sal_Int32 i = 0; i < aUIElementFactories.getLength(); i++ ) { @@ -340,7 +340,7 @@ void ConfigurationAccess_FactoryManager::readConfigurationData() } } -sal_Bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aElement, rtl::OUString& rType, rtl::OUString& rName, rtl::OUString& rModule, rtl::OUString& rServiceSpecifier ) const +sal_Bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aElement, OUString& rType, OUString& rName, OUString& rModule, OUString& rServiceSpecifier ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::impl_getElementProps" ); Reference< XPropertySet > xPropertySet; @@ -385,7 +385,7 @@ UIElementFactoryManager::UIElementFactoryManager( const Reference< XComponentCon m_xContext(rxContext) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::UIElementFactoryManager" ); - m_pConfigAccess = new ConfigurationAccess_FactoryManager( rxContext, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Factories/Registered/UIElementFactories" )) ); + m_pConfigAccess = new ConfigurationAccess_FactoryManager( rxContext, OUString( "/org.openoffice.Office.UI.Factories/Registered/UIElementFactories" ) ); m_pConfigAccess->acquire(); m_xModuleManager = ModuleManager::create( rxContext ); } @@ -400,7 +400,7 @@ UIElementFactoryManager::~UIElementFactoryManager() // XUIElementFactory Reference< XUIElement > SAL_CALL UIElementFactoryManager::createUIElement( - const ::rtl::OUString& ResourceURL, + const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) { @@ -414,9 +414,9 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l m_pConfigAccess->readConfigurationData(); } - const rtl::OUString aPropFrame( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); + const OUString aPropFrame( "Frame" ); - rtl::OUString aModuleId; + OUString aModuleId; PropertyValue aPropValue; Reference< XFrame > xFrame; @@ -466,7 +466,7 @@ throw ( RuntimeException ) return m_pConfigAccess->getFactoriesDescription(); } -Reference< XUIElementFactory > SAL_CALL UIElementFactoryManager::getFactory( const ::rtl::OUString& aResourceURL, const ::rtl::OUString& aModuleId ) +Reference< XUIElementFactory > SAL_CALL UIElementFactoryManager::getFactory( const OUString& aResourceURL, const OUString& aModuleId ) throw ( RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getFactory" ); @@ -478,14 +478,14 @@ throw ( RuntimeException ) m_pConfigAccess->readConfigurationData(); } - rtl::OUString aType; - rtl::OUString aName; + OUString aType; + OUString aName; WindowContentFactoryManager::RetrieveTypeNameFromResourceURL( aResourceURL, aType, aName ); Reference< XComponentContext > xContext( m_xContext ); - rtl::OUString aServiceSpecifier = m_pConfigAccess->getFactorySpecifierFromTypeNameModule( aType, aName, aModuleId ); + OUString aServiceSpecifier = m_pConfigAccess->getFactorySpecifierFromTypeNameModule( aType, aName, aModuleId ); aLock.unlock(); if ( !aServiceSpecifier.isEmpty() ) @@ -494,7 +494,7 @@ throw ( RuntimeException ) return Reference< XUIElementFactory >(); } -void SAL_CALL UIElementFactoryManager::registerFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleId, const ::rtl::OUString& aFactoryImplementationName ) +void SAL_CALL UIElementFactoryManager::registerFactory( const OUString& aType, const OUString& aName, const OUString& aModuleId, const OUString& aFactoryImplementationName ) throw ( ElementExistException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::registerFactory" ); @@ -511,7 +511,7 @@ throw ( ElementExistException, RuntimeException ) // SAFE } -void SAL_CALL UIElementFactoryManager::deregisterFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleId ) +void SAL_CALL UIElementFactoryManager::deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleId ) throw ( NoSuchElementException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::deregisterFactory" ); diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index 496e74e2b643..41d940773fff 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -66,7 +66,7 @@ WindowContentFactoryManager::WindowContentFactoryManager( const uno::Reference< ThreadHelpBase( &Application::GetSolarMutex() ), m_bConfigRead( sal_False ) { - m_pConfigAccess = new ConfigurationAccess_FactoryManager( rxContext, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.WindowContentFactories/Registered/ContentFactories" )) ); + m_pConfigAccess = new ConfigurationAccess_FactoryManager( rxContext, OUString( "/org.openoffice.Office.UI.WindowContentFactories/Registered/ContentFactories" ) ); m_pConfigAccess->acquire(); m_xModuleManager = frame::ModuleManager::create( rxContext ); } @@ -79,7 +79,7 @@ WindowContentFactoryManager::~WindowContentFactoryManager() m_pConfigAccess->release(); } -void WindowContentFactoryManager::RetrieveTypeNameFromResourceURL( const rtl::OUString& aResourceURL, rtl::OUString& aType, rtl::OUString& aName ) +void WindowContentFactoryManager::RetrieveTypeNameFromResourceURL( const OUString& aResourceURL, OUString& aType, OUString& aName ) { const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17; const char RESOURCEURL_PREFIX[] = "private:resource/"; @@ -87,12 +87,12 @@ void WindowContentFactoryManager::RetrieveTypeNameFromResourceURL( const rtl::OU if (( aResourceURL.indexOf( RESOURCEURL_PREFIX ) == 0 ) && ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE )) { - rtl::OUString aTmpStr( aResourceURL.copy( RESOURCEURL_PREFIX_SIZE )); + OUString aTmpStr( aResourceURL.copy( RESOURCEURL_PREFIX_SIZE )); sal_Int32 nToken = 0; sal_Int32 nPart = 0; do { - ::rtl::OUString sToken = aTmpStr.getToken( 0, '/', nToken); + OUString sToken = aTmpStr.getToken( 0, '/', nToken); if ( !sToken.isEmpty() ) { if ( nPart == 0 ) @@ -123,7 +123,7 @@ throw (uno::Exception, uno::RuntimeException) { uno::Reference< uno::XInterface > xWindow; uno::Reference< frame::XFrame > xFrame; - ::rtl::OUString aResourceURL; + OUString aResourceURL; for (sal_Int32 i=0; i < Arguments.getLength(); i++ ) { @@ -146,9 +146,9 @@ throw (uno::Exception, uno::RuntimeException) // UNSAFE // Determine the module identifier - ::rtl::OUString aType; - ::rtl::OUString aName; - ::rtl::OUString aModuleId; + OUString aType; + OUString aName; + OUString aModuleId; try { if ( xFrame.is() && xModuleManager.is() ) @@ -163,7 +163,7 @@ throw (uno::Exception, uno::RuntimeException) !aName.isEmpty() && !aModuleId.isEmpty() ) { - ::rtl::OUString aImplementationName; + OUString aImplementationName; uno::Reference< uno::XInterface > xHolder( static_cast<cppu::OWeakObject*>(this), uno::UNO_QUERY ); // Detetmine the implementation name of the window content factory dependent on the diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index f53eb4c9891f..99959adc1ffa 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -111,13 +111,13 @@ OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageListsDescriptor& aI m_aImageList.pImageList = NULL; m_aImageList.pExternalImageList = NULL; - m_nHashMaskModeBitmap = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_BITMAP )).hashCode(); - m_nHashMaskModeColor = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_COLOR )).hashCode(); + m_nHashMaskModeBitmap = OUString( ATTRIBUTE_MASKMODE_BITMAP ).hashCode(); + m_nHashMaskModeColor = OUString( ATTRIBUTE_MASKMODE_COLOR ).hashCode(); // create hash map to speed up lookup for ( int i = 0; i < (int)IMG_XML_ENTRY_COUNT; i++ ) { - ::rtl::OUStringBuffer temp( 20 ); + OUStringBuffer temp( 20 ); if ( ImagesEntries[i].nNamespace == IMG_NS_IMAGE ) temp.appendAscii( XMLNS_IMAGE ); @@ -158,14 +158,14 @@ throw( SAXException, RuntimeException ) if (( m_bImageContainerStartFound && !m_bImageContainerEndFound ) || ( !m_bImageContainerStartFound && m_bImageContainerEndFound ) ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No matching start or end element 'image:imagecontainer' found!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "No matching start or end element 'image:imagecontainer' found!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } void SAL_CALL OReadImagesDocumentHandler::startElement( - const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttribs ) + const OUString& aName, const Reference< XAttributeList > &xAttribs ) throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -180,8 +180,8 @@ throw( SAXException, RuntimeException ) // image:imagecontainer element (container element for all further image elements) if ( m_bImageContainerStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:imagecontainer' cannot be embeded into 'image:imagecontainer'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element 'image:imagecontainer' cannot be embeded into 'image:imagecontainer'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -193,15 +193,15 @@ throw( SAXException, RuntimeException ) { if ( !m_bImageContainerStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:images' must be embeded into element 'image:imagecontainer'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element 'image:images' must be embeded into element 'image:imagecontainer'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } if ( m_bImagesStartFound ) { - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:images' cannot be embeded into 'image:images'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element 'image:images' cannot be embeded into 'image:images'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -226,7 +226,7 @@ throw( SAXException, RuntimeException ) case IMG_ATTRIBUTE_MASKCOLOR: { - ::rtl::OUString aColor = xAttribs->getValueByIndex( n ); + OUString aColor = xAttribs->getValueByIndex( n ); if ( !aColor.isEmpty() ) { @@ -259,8 +259,8 @@ throw( SAXException, RuntimeException ) delete m_pImages; m_pImages = NULL; - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Attribute image:maskmode must be 'maskcolor' or 'maskbitmap'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Attribute image:maskmode must be 'maskcolor' or 'maskbitmap'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -289,8 +289,8 @@ throw( SAXException, RuntimeException ) delete m_pImages; m_pImages = NULL; - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute xlink:href must have a value!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Required attribute xlink:href must have a value!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -304,8 +304,8 @@ throw( SAXException, RuntimeException ) delete m_pImages; m_pImages = NULL; - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:entry' must be embeded into element 'image:images'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element 'image:entry' must be embeded into element 'image:images'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -351,8 +351,8 @@ throw( SAXException, RuntimeException ) delete m_pImages; m_pImages = NULL; - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'image:bitmap-index' must have a value >= 0!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Required attribute 'image:bitmap-index' must have a value >= 0!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -363,8 +363,8 @@ throw( SAXException, RuntimeException ) delete m_pImages; m_pImages = NULL; - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'image:command' must have a value!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Required attribute 'image:command' must have a value!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -381,8 +381,8 @@ throw( SAXException, RuntimeException ) delete m_pImages; m_pImages = NULL; - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalimages' must be embeded into element 'image:imagecontainer'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element 'image:externalimages' must be embeded into element 'image:imagecontainer'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -392,8 +392,8 @@ throw( SAXException, RuntimeException ) delete m_pImages; m_pImages = NULL; - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalimages' cannot be embeded into 'image:externalimages'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element 'image:externalimages' cannot be embeded into 'image:externalimages'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -412,8 +412,8 @@ throw( SAXException, RuntimeException ) m_pImages = NULL; m_pExternalImages = NULL; - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalentry' must be embeded into 'image:externalimages'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element 'image:externalentry' must be embeded into 'image:externalimages'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -424,8 +424,8 @@ throw( SAXException, RuntimeException ) m_pImages = NULL; m_pExternalImages = NULL; - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalentry' cannot be embeded into 'image:externalentry'!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Element 'image:externalentry' cannot be embeded into 'image:externalentry'!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -468,8 +468,8 @@ throw( SAXException, RuntimeException ) m_pImages = NULL; m_pExternalImages = NULL; - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'image:command' must have a value!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Required attribute 'image:command' must have a value!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -482,8 +482,8 @@ throw( SAXException, RuntimeException ) m_pImages = NULL; m_pExternalImages = NULL; - ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'xlink:href' must have a value!" )); + OUString aErrorMessage = getErrorLineString(); + aErrorMessage += OUString( "Required attribute 'xlink:href' must have a value!" ); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -500,7 +500,7 @@ throw( SAXException, RuntimeException ) } } -void SAL_CALL OReadImagesDocumentHandler::endElement(const ::rtl::OUString& aName) +void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName) throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -559,18 +559,18 @@ throw( SAXException, RuntimeException ) } } -void SAL_CALL OReadImagesDocumentHandler::characters(const ::rtl::OUString&) +void SAL_CALL OReadImagesDocumentHandler::characters(const OUString&) throw( SAXException, RuntimeException ) { } -void SAL_CALL OReadImagesDocumentHandler::ignorableWhitespace(const ::rtl::OUString&) +void SAL_CALL OReadImagesDocumentHandler::ignorableWhitespace(const OUString&) throw( SAXException, RuntimeException ) { } void SAL_CALL OReadImagesDocumentHandler::processingInstruction( - const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) + const OUString& /*aTarget*/, const OUString& /*aData*/ ) throw( SAXException, RuntimeException ) { } @@ -584,7 +584,7 @@ throw( SAXException, RuntimeException ) m_xLocator = xLocator; } -::rtl::OUString OReadImagesDocumentHandler::getErrorLineString() +OUString OReadImagesDocumentHandler::getErrorLineString() { ResetableGuard aGuard( m_aLock ); @@ -593,10 +593,10 @@ throw( SAXException, RuntimeException ) if ( m_xLocator.is() ) { snprintf( buffer, sizeof(buffer), "Line: %ld - ", static_cast<long>( m_xLocator->getLineNumber() )); - return ::rtl::OUString::createFromAscii( buffer ); + return OUString::createFromAscii( buffer ); } else - return ::rtl::OUString(); + return OUString(); } @@ -613,11 +613,11 @@ OWriteImagesDocumentHandler::OWriteImagesDocumentHandler( { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); - m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); - m_aXMLImageNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_IMAGE_PREFIX )); - m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); - m_aAttributeXlinkType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XLINK_TYPE )); - m_aAttributeValueSimple = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XLINK_TYPE_VALUE )); + m_aAttributeType = OUString( ATTRIBUTE_TYPE_CDATA ); + m_aXMLImageNS = OUString( XMLNS_IMAGE_PREFIX ); + m_aXMLXlinkNS = OUString( XMLNS_XLINK_PREFIX ); + m_aAttributeXlinkType = OUString( ATTRIBUTE_XLINK_TYPE ); + m_aAttributeValueSimple = OUString( ATTRIBUTE_XLINK_TYPE_VALUE ); } OWriteImagesDocumentHandler::~OWriteImagesDocumentHandler() @@ -635,23 +635,23 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw Reference< XExtendedDocumentHandler > xExtendedDocHandler( m_xWriteDocumentHandler, UNO_QUERY ); if ( xExtendedDocHandler.is() ) { - xExtendedDocHandler->unknown( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMAGES_DOCTYPE )) ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + xExtendedDocHandler->unknown( OUString( IMAGES_DOCTYPE ) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); } ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY ); - pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_IMAGE )), + pList->AddAttribute( OUString( ATTRIBUTE_XMLNS_IMAGE), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_IMAGE )) ); + OUString( XMLNS_IMAGE ) ); - pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_XLINK )), + pList->AddAttribute( OUString( ATTRIBUTE_XMLNS_XLINK ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK )) ); + OUString( XMLNS_XLINK ) ); - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGESCONTAINER )), pList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_IMAGESCONTAINER ), pList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); if ( m_aImageListsItems.pImageList ) { @@ -669,9 +669,9 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw WriteExternalImageList( m_aImageListsItems.pExternalImageList ); } - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGESCONTAINER )) ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_IMAGESCONTAINER ) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); m_xWriteDocumentHandler->endDocument(); } @@ -690,53 +690,53 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* m_aAttributeType, m_aAttributeValueSimple ); - pList->AddAttribute( m_aXMLXlinkNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HREF )), + pList->AddAttribute( m_aXMLXlinkNS + OUString( ATTRIBUTE_HREF ), m_aAttributeType, pImageList->aURL ); if ( pImageList->nMaskMode == ImageMaskMode_Bitmap ) { - pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE )), + pList->AddAttribute( m_aXMLImageNS + OUString( ATTRIBUTE_MASKMODE ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_BITMAP )) ); + OUString( ATTRIBUTE_MASKMODE_BITMAP ) ); - pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKURL )), + pList->AddAttribute( m_aXMLImageNS + OUString( ATTRIBUTE_MASKURL ), m_aAttributeType, pImageList->aMaskURL ); if ( pImageList->aHighContrastMaskURL.Len() > 0 ) { - pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HIGHCONTRASTMASKURL )), + pList->AddAttribute( m_aXMLImageNS + OUString( ATTRIBUTE_HIGHCONTRASTMASKURL ), m_aAttributeType, pImageList->aHighContrastMaskURL ); } } else { - ::rtl::OUStringBuffer aColorStrBuffer( 8 ); + OUStringBuffer aColorStrBuffer( 8 ); sal_Int64 nValue = pImageList->aMaskColor.GetRGBColor(); aColorStrBuffer.appendAscii( "#" ); - aColorStrBuffer.append( ::rtl::OUString::valueOf( nValue, 16 )); + aColorStrBuffer.append( OUString::valueOf( nValue, 16 )); - pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKCOLOR )), + pList->AddAttribute( m_aXMLImageNS + OUString( ATTRIBUTE_MASKCOLOR ), m_aAttributeType, aColorStrBuffer.makeStringAndClear() ); - pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE )), + pList->AddAttribute( m_aXMLImageNS + OUString( ATTRIBUTE_MASKMODE ), m_aAttributeType, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_COLOR )) ); + OUString( ATTRIBUTE_MASKMODE_COLOR ) ); } if ( pImageList->aHighContrastURL.Len() > 0 ) { - pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HIGHCONTRASTURL )), + pList->AddAttribute( m_aXMLImageNS + OUString( ATTRIBUTE_HIGHCONTRASTURL ), m_aAttributeType, pImageList->aHighContrastURL ); } - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGES )), xList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_IMAGES ), xList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); ImageItemListDescriptor* pImageItemList = pImageList->pImageItemList; if ( pImageItemList ) @@ -745,8 +745,8 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* WriteImage( &(*pImageItemList)[i] ); } - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGES )) ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_IMAGES ) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); } void OWriteImagesDocumentHandler::WriteImage( const ImageItemDescriptor* pImage ) throw @@ -755,26 +755,26 @@ void OWriteImagesDocumentHandler::WriteImage( const ImageItemDescriptor* pImage ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY ); - pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_BITMAPINDEX )), + pList->AddAttribute( m_aXMLImageNS + OUString( ATTRIBUTE_BITMAPINDEX ), m_aAttributeType, - ::rtl::OUString::valueOf( (sal_Int32)pImage->nIndex ) ); + OUString::valueOf( (sal_Int32)pImage->nIndex ) ); - pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_COMMAND )), + pList->AddAttribute( m_aXMLImageNS + OUString( ATTRIBUTE_COMMAND ), m_aAttributeType, pImage->aCommandURL ); - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_ENTRY )), xList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_ENTRY ), xList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_ENTRY )) ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_ENTRY ) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); } void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageItemListDescriptor* pExternalImageList ) throw ( SAXException, RuntimeException ) { - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALIMAGES )), m_xEmptyList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_EXTERNALIMAGES ), m_xEmptyList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); for ( sal_uInt16 i = 0; i < pExternalImageList->size(); i++ ) { @@ -782,9 +782,9 @@ void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageIte WriteExternalImage( pItem ); } - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALIMAGES )) ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_EXTERNALIMAGES ) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); } void OWriteImagesDocumentHandler::WriteExternalImage( const ExternalImageItemDescriptor* pExternalImage ) throw @@ -800,23 +800,23 @@ void OWriteImagesDocumentHandler::WriteExternalImage( const ExternalImageItemDes if ( pExternalImage->aURL.Len() > 0 ) { - pList->AddAttribute( m_aXMLXlinkNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HREF )), + pList->AddAttribute( m_aXMLXlinkNS + OUString( ATTRIBUTE_HREF ), m_aAttributeType, pExternalImage->aURL ); } if ( pExternalImage->aCommandURL.Len() > 0 ) { - pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_COMMAND )), + pList->AddAttribute( m_aXMLImageNS + OUString( ATTRIBUTE_COMMAND ), m_aAttributeType, pExternalImage->aCommandURL ); } - m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALENTRY )), xList ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_EXTERNALENTRY ), xList ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALENTRY )) ); - m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); + m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_EXTERNALENTRY ) ); + m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); } } // namespace framework |