[Libreoffice-commits] core.git: framework/inc framework/source
Krisztian Pinter
pin.terminator at gmail.com
Thu Mar 7 18:45:45 PST 2013
framework/inc/framework/addonsoptions.hxx | 48 -
framework/inc/framework/menuconfiguration.hxx | 12
framework/inc/macros/generic.hxx | 4
framework/inc/properties.h | 78 +--
framework/source/classes/menumanager.cxx | 86 +--
framework/source/dispatch/popupmenudispatcher.cxx | 20
framework/source/fwe/classes/actiontriggercontainer.cxx | 28 -
framework/source/fwe/classes/actiontriggerpropertyset.cxx | 26 -
framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx | 14
framework/source/fwe/classes/addonmenu.cxx | 44 -
framework/source/fwe/classes/addonsoptions.cxx | 96 +--
framework/source/fwe/classes/bmkmenu.cxx | 26 -
framework/source/fwe/classes/rootactiontriggercontainer.cxx | 36 -
framework/source/fwe/helper/actiontriggerhelper.cxx | 32 -
framework/source/fwe/helper/propertysetcontainer.cxx | 4
framework/source/fwe/helper/titlehelper.cxx | 46 -
framework/source/fwe/helper/undomanagerhelper.cxx | 68 +-
framework/source/fwe/xml/menudocumenthandler.cxx | 234 ++++-----
framework/source/fwe/xml/saxnamespacefilter.cxx | 38 -
framework/source/fwe/xml/statusbardocumenthandler.cxx | 176 +++---
framework/source/fwe/xml/toolboxdocumenthandler.cxx | 256 +++++-----
framework/source/fwe/xml/xmlnamespaces.cxx | 34 -
framework/source/fwi/jobs/jobconst.cxx | 12
framework/source/fwi/uielement/constitemcontainer.cxx | 30 -
framework/source/fwi/uielement/itemcontainer.cxx | 12
framework/source/fwi/uielement/rootitemcontainer.cxx | 18
framework/source/layoutmanager/helpers.cxx | 34 -
framework/source/layoutmanager/helpers.hxx | 10
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 150 ++---
framework/source/services/backingwindow.cxx | 80 +--
framework/source/services/pathsettings.cxx | 100 +--
framework/source/services/substitutepathvars.cxx | 183 +++----
framework/source/services/taskcreatorsrv.cxx | 30 -
framework/source/tabwin/tabwindow.cxx | 22
framework/source/tabwin/tabwinfactory.cxx | 2
framework/source/uiconfiguration/globalsettings.cxx | 26 -
framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 14
framework/source/uielement/addonstoolbarmanager.cxx | 42 -
framework/source/uielement/comboboxtoolbarcontroller.cxx | 22
framework/source/uielement/dropdownboxtoolbarcontroller.cxx | 20
framework/source/uielement/edittoolbarcontroller.cxx | 10
framework/source/uielement/headermenucontroller.cxx | 26 -
framework/source/uielement/imagebuttontoolbarcontroller.cxx | 14
framework/source/uielement/langselectionstatusbarcontroller.cxx | 18
framework/source/uielement/popupmenucontroller.cxx | 10
framework/source/uielement/recentfilesmenucontroller.cxx | 40 -
framework/source/uielement/simpletextstatusbarcontroller.cxx | 6
framework/source/uielement/spinfieldtoolbarcontroller.cxx | 64 +-
framework/source/uielement/statusbarmanager.cxx | 34 -
framework/source/uielement/togglebuttontoolbarcontroller.cxx | 30 -
framework/source/uielement/toolbarsmenucontroller.cxx | 84 +--
framework/source/uifactory/addonstoolboxfactory.cxx | 18
framework/source/uifactory/factoryconfiguration.cxx | 78 +--
framework/source/uifactory/menubarfactory.cxx | 20
framework/source/uifactory/popupmenucontrollerfactory.cxx | 2
framework/source/uifactory/statusbarcontrollerfactory.cxx | 2
framework/source/uifactory/toolbarcontrollerfactory.cxx | 38 -
framework/source/uifactory/uielementfactorymanager.cxx | 102 +--
framework/source/uifactory/windowcontentfactorymanager.cxx | 18
framework/source/xml/imagesdocumenthandler.cxx | 182 +++----
60 files changed, 1504 insertions(+), 1505 deletions(-)
New commits:
commit fd4380759d67bcfa582dd8880077ea8445ab8a06
Author: Krisztian Pinter <pin.terminator at gmail.com>
Date: Fri Mar 8 03:07:46 2013 +0100
RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals
Change-Id: Ief6418425676d6943993513c4d05c8d22e4740cf
Reviewed-on: https://gerrit.libreoffice.org/2470
Tested-by: Thomas Arnhold <thomas at arnhold.org>
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/framework/inc/framework/addonsoptions.hxx b/framework/inc/framework/addonsoptions.hxx
index a4d4ffa..def7433 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 9b6eb74..1ccd6ba 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 b64289c..2b0e918 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 31052a2..8b70683 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 185bebe..a72204f 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 afc8c7c..30b271f 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 0a2efcf..974a8d1 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 bcde553..a10f90a 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 c5b33ad..75afc5a 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 f5c5218..871bfca 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 eeaf584..c7a6490 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 e44eadd..60301d9 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 8fab56f..3996d6d 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 7a25834..cb57da2 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 48357b1..70d9d28 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 ec2ae43..407d5f2 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 3ad92eb..ec571eb 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,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list