framework: Use appropriate OUString functions on string constants

Change-Id: I5da5cd3254102c742021b3e7b4e1f907ca897ca5

9 files changed, 20 insertions, 40 deletions

diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h
index 0888b2e4f8fb..8d7bce53f6a5 100644
--- a/framework/inc/acceleratorconst.h
+++ b/framework/inc/acceleratorconst.h
@@ -45,19 +45,9 @@ namespace framework{
 #define AL_ATTRIBUTE_MOD_MOD3           DECLARE_ASCII("accel:mod3" )
 
 // same items with full qualified name space
-#define NS_ELEMENT_ACCELERATORLIST      DECLARE_ASCII("http://openoffice.org/2001/accel^acceleratorlist")
-#define NS_ELEMENT_ITEM                 DECLARE_ASCII("http://openoffice.org/2001/accel^item"           )
-
 #define NS_XMLNS_ACCEL                  DECLARE_ASCII("http://openoffice.org/2001/accel")
 #define NS_XMLNS_XLINK                  DECLARE_ASCII("http://www.w3.org/1999/xlink"    )
 
-#define NS_ATTRIBUTE_URL                DECLARE_ASCII("http://www.w3.org/1999/xlink^href"     )
-#define NS_ATTRIBUTE_KEYCODE            DECLARE_ASCII("http://openoffice.org/2001/accel^code" )
-#define NS_ATTRIBUTE_MOD_SHIFT          DECLARE_ASCII("http://openoffice.org/2001/accel^shift")
-#define NS_ATTRIBUTE_MOD_MOD1           DECLARE_ASCII("http://openoffice.org/2001/accel^mod1" )
-#define NS_ATTRIBUTE_MOD_MOD2           DECLARE_ASCII("http://openoffice.org/2001/accel^mod2" )
-#define NS_ATTRIBUTE_MOD_MOD3           DECLARE_ASCII("http://openoffice.org/2001/accel^mod3" )
-
 } // namespace framework
 
 #endif // INCLUDED_FRAMEWORK_INC_ACCELERATORCONST_H
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index b942566606b0..52d3997c3ad9 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -35,7 +35,6 @@ namespace framework{
 
 #define CFG_PATH_SEPARATOR                          DECLARE_ASCII("/"                                               )   /// separator for configuration paths
 
-#define SETNAME_HANDLER                             DECLARE_ASCII("HandlerSet"                                      )   /// name of configuration set inside package
 #define PROPERTY_PROTOCOLS                          DECLARE_ASCII("Protocols"                                       )   /// properties of a protocol handler
 
 /**
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index 91e56b95c7d4..142eb8256bd1 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -211,7 +211,7 @@ class StatusIndicatorFactory : public  ::cppu::WeakImplHelper4<
             throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             css::uno::Sequence< OUString > aSeq(1);
-            aSeq[0] = OUString("com.sun.star.task.StatusIndicatorFactory");
+            aSeq[0] = "com.sun.star.task.StatusIndicatorFactory";
             return aSeq;
         }
 
diff --git a/framework/inc/services.h b/framework/inc/services.h
index 673228c710c3..5d93fac75fef 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -29,20 +29,20 @@ namespace framework{
 #define SERVICENAME_FILTERFACTORY                               DECLARE_ASCII("com.sun.star.document.FilterFactory"                 )
 #define SERVICENAME_CFGUPDATEACCESS                             DECLARE_ASCII("com.sun.star.configuration.ConfigurationUpdateAccess")   // provides read/write access to the configuration
 #define SERVICENAME_CFGREADACCESS                               DECLARE_ASCII("com.sun.star.configuration.ConfigurationAccess"      )   // provides readonly access to the configuration
-#define SERVICENAME_CONTENTHANDLER                              DECLARE_ASCII("com.sun.star.frame.ContentHandler"                   )
-#define SERVICENAME_JOB                                         DECLARE_ASCII("com.sun.star.task.Job"                               )
-#define SERVICENAME_PROTOCOLHANDLER                             DECLARE_ASCII("com.sun.star.frame.ProtocolHandler"                  )
+#define SERVICENAME_CONTENTHANDLER                              "com.sun.star.frame.ContentHandler"
+#define SERVICENAME_JOB                                         "com.sun.star.task.Job"
+#define SERVICENAME_PROTOCOLHANDLER                             "com.sun.star.frame.ProtocolHandler"
 #define SERVICENAME_POPUPMENUCONTROLLERFACTORY                  DECLARE_ASCII("com.sun.star.frame.PopupMenuControllerFactory" )
-#define SERVICENAME_POPUPMENUCONTROLLER                         DECLARE_ASCII("com.sun.star.frame.PopupMenuController"       )
+#define SERVICENAME_POPUPMENUCONTROLLER                         "com.sun.star.frame.PopupMenuController"
 #define SERVICENAME_MENUBARFACTORY                              DECLARE_ASCII("com.sun.star.ui.UIElementFactory"             )
 #define SERVICENAME_TOOLBARFACTORY                              DECLARE_ASCII("com.sun.star.ui.ToolBarFactory"               )
 #define SERVICENAME_TOOLBARCONTROLLERFACTORY                    DECLARE_ASCII("com.sun.star.frame.ToolbarControllerFactory"         )
 #define SERVICENAME_STATUSBARFACTORY                            DECLARE_ASCII("com.sun.star.ui.StatusBarFactory"             )
 #define SERVICENAME_STATUSBARCONTROLLERFACTORY                  DECLARE_ASCII("com.sun.star.frame.StatusbarControllerFactory"       )
 #define SERVICENAME_STATUSBARCONTROLLER                         DECLARE_ASCII("com.sun.star.frame.StatusbarController"              )
-#define SERVICENAME_TABWINFACTORY                               DECLARE_ASCII("com.sun.star.frame.TabWindowFactory"                 )
-#define SERVICENAME_TABWINDOW                                   DECLARE_ASCII("com.sun.star.frame.TabWindow"                        )
-#define SERVICENAME_STRINGABBREVIATION                          DECLARE_ASCII("com.sun.star.util.UriAbbreviation"                   )
+#define SERVICENAME_TABWINFACTORY                               "com.sun.star.frame.TabWindowFactory"
+#define SERVICENAME_TABWINDOW                                   "com.sun.star.frame.TabWindow"
+#define SERVICENAME_STRINGABBREVIATION                          "com.sun.star.util.UriAbbreviation"
 #define SERVICENAME_TABWINDOWSERVICE                            DECLARE_ASCII("com.sun.star.ui.dialogs.TabContainerWindow"          )
 
 //  used implementationnames by framework
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 5635c7f45bd9..b0b2a75aba2c 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -103,7 +103,7 @@ namespace framework
                 throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
             {
                 css::uno::Sequence< OUString > aSeq(1);
-                aSeq[0] = OUString("com.sun.star.frame.LayoutManager");
+                aSeq[0] = "com.sun.star.frame.LayoutManager";
                 return aSeq;
             }
 
diff --git a/framework/inc/targets.h b/framework/inc/targets.h
index a266bc59b9b7..0405d9168009 100644
--- a/framework/inc/targets.h
+++ b/framework/inc/targets.h
@@ -26,23 +26,14 @@ namespace framework{
 
 //  Values for special frame search ... sTargetFrameName of findFrame() or queryDispatch() or loadComponentFromURL()
 
-#define SPECIALTARGET_ASCII_SELF            "_self"                             // The frame himself is searched.
-#define SPECIALTARGET_ASCII_PARENT          "_parent"                           // The direct parent frame is searched.
-#define SPECIALTARGET_ASCII_TOP             "_top"                              // Search at our parents for the first task (if any exist) or a frame without a parent.
-#define SPECIALTARGET_ASCII_BLANK           "_blank"                            // Create a new task.
-#define SPECIALTARGET_ASCII_DEFAULT         "_default"                          // Create a new task or recycle an existing one
-#define SPECIALTARGET_ASCII_BEAMER          "_beamer"                           // special frame in hierarchy
-#define SPECIALTARGET_ASCII_MENUBAR         "_menubar"                          // special target for menubars
-#define SPECIALTARGET_ASCII_HELPTASK        "OFFICE_HELP_TASK"                  // special name for our help task
-
-#define SPECIALTARGET_SELF                  DECLARE_ASCII(SPECIALTARGET_ASCII_SELF       )
-#define SPECIALTARGET_PARENT                DECLARE_ASCII(SPECIALTARGET_ASCII_PARENT     )
-#define SPECIALTARGET_TOP                   DECLARE_ASCII(SPECIALTARGET_ASCII_TOP        )
-#define SPECIALTARGET_BLANK                 DECLARE_ASCII(SPECIALTARGET_ASCII_BLANK      )
-#define SPECIALTARGET_DEFAULT               DECLARE_ASCII(SPECIALTARGET_ASCII_DEFAULT    )
-#define SPECIALTARGET_BEAMER                DECLARE_ASCII(SPECIALTARGET_ASCII_BEAMER     )
-#define SPECIALTARGET_MENUBAR               DECLARE_ASCII(SPECIALTARGET_ASCII_MENUBAR    )
-#define SPECIALTARGET_HELPTASK              DECLARE_ASCII(SPECIALTARGET_ASCII_HELPTASK   )
+#define SPECIALTARGET_SELF            "_self"                             // The frame himself is searched.
+#define SPECIALTARGET_PARENT          "_parent"                           // The direct parent frame is searched.
+#define SPECIALTARGET_TOP             "_top"                              // Search at our parents for the first task (if any exist) or a frame without a parent.
+#define SPECIALTARGET_BLANK           "_blank"                            // Create a new task.
+#define SPECIALTARGET_DEFAULT         "_default"                          // Create a new task or recycle an existing one
+#define SPECIALTARGET_BEAMER          "_beamer"                           // special frame in hierarchy
+#define SPECIALTARGET_MENUBAR         "_menubar"                          // special target for menubars
+#define SPECIALTARGET_HELPTASK        "OFFICE_HELP_TASK"                  // special name for our help task
 
 }       //  namespace framework
 
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index bb0f52495b87..250a50533147 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -71,7 +71,7 @@ namespace framework
                 throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
             {
                 css::uno::Sequence< OUString > aSeq(1);
-                aSeq[0] = OUString("com.sun.star.ui.ImageManager");
+                aSeq[0] = "com.sun.star.ui.ImageManager";
                 return aSeq;
             }
 
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index 83a8459f7244..112a1e8a3cd0 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -62,7 +62,7 @@ class UICommandDescription : private cppu::BaseMutex,
             throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             css::uno::Sequence< OUString > aSeq(1);
-            aSeq[0] = OUString("com.sun.star.frame.UICommandDescription");
+            aSeq[0] = "com.sun.star.frame.UICommandDescription";
             return aSeq;
         }
 
diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx
index 250d4df31cc2..da1e73493a09 100644
--- a/framework/inc/uifactory/menubarfactory.hxx
+++ b/framework/inc/uifactory/menubarfactory.hxx
@@ -58,7 +58,7 @@ typedef ::cppu::WeakImplHelper2<
                 throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
             {
                 css::uno::Sequence< OUString > aSeq(1);
-                aSeq[0] = OUString("com.sun.star.ui.UIElementFactory");
+                aSeq[0] = "com.sun.star.ui.UIElementFactory";
                 return aSeq;
             }