Improved loplugin:stringconstant (now that GCC 7 supports it): framework

Change-Id: Ia6eef000a712c9f23f81eaf6d27f5a236da9b24d
Reviewed-on: https://gerrit.libreoffice.org/76673
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

42 files changed, 56 insertions, 56 deletions

diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index f32bc17f432d..0f0485355668 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -471,7 +471,7 @@ OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
     OUString sISOLocale = officecfg::Setup::L10N::ooLocale::get();
 
     if (sISOLocale.isEmpty())
-        return OUString("en-US");
+        return "en-US";
     return sISOLocale;
 }
 
@@ -1326,7 +1326,7 @@ OUString XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const
     OUString sISOLocale = officecfg::Setup::L10N::ooLocale::get();
 
     if (sISOLocale.isEmpty())
-        return OUString("en-US");
+        return "en-US";
     return sISOLocale;
 }
 
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index bb7461aa17a8..74b01f157a31 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -74,7 +74,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.DocumentAcceleratorConfiguration");
+        return "com.sun.star.comp.framework.DocumentAcceleratorConfiguration";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 8c60e7c4574f..da4a177db175 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -57,7 +57,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.GlobalAcceleratorConfiguration");
+        return "com.sun.star.comp.framework.GlobalAcceleratorConfiguration";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 6cdf214ad013..b785ddd6ecc4 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -69,7 +69,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.ModuleAcceleratorConfiguration");
+        return "com.sun.star.comp.framework.ModuleAcceleratorConfiguration";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 3222745966c3..1ee62b70ae9e 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -94,7 +94,7 @@ css::uno::Sequence< OUString > PopupMenuDispatcher::impl_getStaticSupportedServi
 
 OUString PopupMenuDispatcher::impl_getStaticImplementationName()
 {
-    return OUString(IMPLEMENTATIONNAME_POPUPMENUDISPATCHER);
+    return IMPLEMENTATIONNAME_POPUPMENUDISPATCHER;
 }
 
 css::uno::Reference< css::uno::XInterface >
diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index 5d7ed4ab6639..331eb5cb935e 100644
--- a/framework/source/fwe/classes/actiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/actiontriggercontainer.cxx
@@ -100,7 +100,7 @@ Sequence< OUString > SAL_CALL ActionTriggerContainer::getAvailableServiceNames()
 // XServiceInfo
 OUString SAL_CALL ActionTriggerContainer::getImplementationName()
 {
-    return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER );
+    return IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER;
 }
 
 sal_Bool SAL_CALL ActionTriggerContainer::supportsService( const OUString& ServiceName )
diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index 7c02acf1dfa0..d0215c37e1f8 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -96,7 +96,7 @@ void SAL_CALL ActionTriggerPropertySet::release() throw ()
 // XServiceInfo
 OUString SAL_CALL ActionTriggerPropertySet::getImplementationName()
 {
-    return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGER );
+    return IMPLEMENTATIONNAME_ACTIONTRIGGER;
 }
 
 sal_Bool SAL_CALL ActionTriggerPropertySet::supportsService( const OUString& ServiceName )
diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index d05d8a173160..fd24370f6893 100644
--- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -91,7 +91,7 @@ void ActionTriggerSeparatorPropertySet::release() throw()
 // XServiceInfo
 OUString SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationName()
 {
-    return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR );
+    return IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR;
 }
 
 sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::supportsService( const OUString& ServiceName )
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index a2dd82f9bc5a..8ce69fde740a 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -196,7 +196,7 @@ sal_Bool SAL_CALL RootActionTriggerContainer::hasElements()
 // XServiceInfo
 OUString SAL_CALL RootActionTriggerContainer::getImplementationName()
 {
-    return OUString( IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER );
+    return IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER;
 }
 
 sal_Bool SAL_CALL RootActionTriggerContainer::supportsService( const OUString& ServiceName )
diff --git a/framework/source/fwi/jobs/jobconst.cxx b/framework/source/fwi/jobs/jobconst.cxx
index 5afd5dd8e101..1d84ce134124 100644
--- a/framework/source/fwi/jobs/jobconst.cxx
+++ b/framework/source/fwi/jobs/jobconst.cxx
@@ -23,17 +23,17 @@ namespace framework{
 
 const OUString JobConst::ANSWER_DEACTIVATE_JOB()
 {
-    return OUString("Deactivate");
+    return "Deactivate";
 }
 
 const OUString JobConst::ANSWER_SAVE_ARGUMENTS()
 {
-    return OUString("SaveArguments");
+    return "SaveArguments";
 }
 
 const OUString JobConst::ANSWER_SEND_DISPATCHRESULT()
 {
-    return OUString("SendDispatchResult");
+    return "SendDispatchResult";
 }
 
 } // namespace framework
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index 59ba3a0ec2b4..0407f05591d3 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -92,7 +92,7 @@ public:
 public:
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.jobs.JobDispatch");
+        return "com.sun.star.comp.framework.jobs.JobDispatch";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 6e54d7375f43..1dbd7a9428c7 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -88,7 +88,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.JobExecutor");
+        return "com.sun.star.comp.framework.JobExecutor";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx
index e8e1c769d1f2..b64a4e131717 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -281,7 +281,7 @@ ContextChangeEventMultiplexer::FocusDescriptor* ContextChangeEventMultiplexer::G
 
 OUString SAL_CALL ContextChangeEventMultiplexer::getImplementationName()
 {
-    return OUString("org.apache.openoffice.comp.framework.ContextChangeEventMultiplexer");
+    return "org.apache.openoffice.comp.framework.ContextChangeEventMultiplexer";
 }
 
 sal_Bool SAL_CALL ContextChangeEventMultiplexer::supportsService ( const OUString& rsServiceName)
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index cb9726ae1a01..35d5f0a0d8ea 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -446,7 +446,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.AutoRecovery");
+        return "com.sun.star.comp.framework.AutoRecovery";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index c9fa016790cf..ce3c4ed06d95 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -81,7 +81,7 @@ enum PropHandle {
 
 OUString SAL_CALL Desktop::getImplementationName()
 {
-    return OUString("com.sun.star.comp.framework.Desktop");
+    return "com.sun.star.comp.framework.Desktop";
 }
 
 sal_Bool SAL_CALL Desktop::supportsService(OUString const & ServiceName)
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 3bd44ff45b94..6b23a12b6e42 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -126,7 +126,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.Frame");
+        return "com.sun.star.comp.framework.Frame";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index d8b24d3aef76..96d400bb5ecc 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -134,7 +134,7 @@ ModuleManager::ModuleManager(const css::uno::Reference< css::uno::XComponentCont
 
 OUString ModuleManager::getImplementationName()
 {
-    return OUString("com.sun.star.comp.framework.ModuleManager");
+    return "com.sun.star.comp.framework.ModuleManager";
 }
 
 sal_Bool ModuleManager::supportsService(OUString const & ServiceName)
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index a008a3a97578..6a6363217b43 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -175,7 +175,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.PathSettings");
+        return "com.sun.star.comp.framework.PathSettings";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index db19346d7f76..f88fd258c1e6 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -112,7 +112,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.frame.SessionListener");
+        return "com.sun.star.comp.frame.SessionListener";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 87885f64072e..1836fa00e554 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -141,7 +141,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.PathSubstitution");
+        return "com.sun.star.comp.framework.PathSubstitution";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index 532c96c401f3..04d4f98fe776 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -67,7 +67,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.TaskCreator");
+        return "com.sun.star.comp.framework.TaskCreator";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 5c666103e138..a769790d22c8 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -39,7 +39,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.URLTransformer");
+        return "com.sun.star.comp.framework.URLTransformer";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 7a9c27964d25..8c0fb8563ade 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -67,7 +67,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier");
+        return "com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index ba205d0420bc..305cc8c08300 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -90,7 +90,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.ModuleUIConfigurationManager");
+        return "com.sun.star.comp.framework.ModuleUIConfigurationManager";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 27440a7437cd..f7b1d3665033 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -355,7 +355,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.UICategoryDescription");
+        return "com.sun.star.comp.framework.UICategoryDescription";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index c5aa509242e9..ef8015660cdb 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -74,7 +74,7 @@ class UIConfigurationManager :   public ::cppu::WeakImplHelper<
 public:
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.UIConfigurationManager");
+        return "com.sun.star.comp.framework.UIConfigurationManager";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index e2c62bc2caba..2b75292c3a12 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -1240,7 +1240,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.WindowStateConfiguration");
+        return "com.sun.star.comp.framework.WindowStateConfiguration";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 26154c2e8071..036aa3f24b55 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -117,7 +117,7 @@ public:
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.ControlMenuController");
+        return "com.sun.star.comp.framework.ControlMenuController";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 772bb4ec81e9..2442171c6606 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -57,7 +57,7 @@ public:
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.ObjectMenuController");
+        return "com.sun.star.comp.framework.ObjectMenuController";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 25037a4b9866..63a048604d76 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -303,7 +303,7 @@ GenericPopupToolbarController::GenericPopupToolbarController(
 
 OUString GenericPopupToolbarController::getImplementationName()
 {
-    return OUString("com.sun.star.comp.framework.GenericPopupToolbarController");
+    return "com.sun.star.comp.framework.GenericPopupToolbarController";
 }
 
 sal_Bool GenericPopupToolbarController::supportsService(OUString const & rServiceName)
@@ -564,7 +564,7 @@ void SaveToolbarController::dispose()
 
 OUString SaveToolbarController::getImplementationName()
 {
-    return OUString("com.sun.star.comp.framework.SaveToolbarController");
+    return "com.sun.star.comp.framework.SaveToolbarController";
 }
 
 sal_Bool SaveToolbarController::supportsService( OUString const & rServiceName )
@@ -608,7 +608,7 @@ NewToolbarController::NewToolbarController(
 
 OUString NewToolbarController::getImplementationName()
 {
-    return OUString("org.apache.openoffice.comp.framework.NewToolbarController");
+    return "org.apache.openoffice.comp.framework.NewToolbarController";
 }
 
 sal_Bool NewToolbarController::supportsService(OUString const & rServiceName)
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 5d6581a37bef..72e3e5006e6f 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -58,7 +58,7 @@ public:
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.RecentFilesMenuController");
+        return "com.sun.star.comp.framework.RecentFilesMenuController";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx
index c499cf928f8b..18195dfc0071 100644
--- a/framework/source/uielement/resourcemenucontroller.cxx
+++ b/framework/source/uielement/resourcemenucontroller.cxx
@@ -329,9 +329,9 @@ void ResourceMenuController::disposing()
 OUString ResourceMenuController::getImplementationName()
 {
     if ( m_bToolbarContainer )
-        return OUString( "com.sun.star.comp.framework.ToolbarAsMenuController" );
+        return "com.sun.star.comp.framework.ToolbarAsMenuController";
 
-    return OUString( "com.sun.star.comp.framework.ResourceMenuController" );
+    return "com.sun.star.comp.framework.ResourceMenuController";
 }
 
 css::uno::Sequence< OUString > ResourceMenuController::getSupportedServiceNames()
@@ -380,7 +380,7 @@ void SaveAsMenuController::impl_setPopupMenu()
 
 OUString SaveAsMenuController::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.framework.SaveAsMenuController" );
+    return "com.sun.star.comp.framework.SaveAsMenuController";
 }
 
 }
diff --git a/framework/source/uielement/styletoolbarcontroller.cxx b/framework/source/uielement/styletoolbarcontroller.cxx
index fa9ff0593048..dfc8fa5bf007 100644
--- a/framework/source/uielement/styletoolbarcontroller.cxx
+++ b/framework/source/uielement/styletoolbarcontroller.cxx
@@ -27,17 +27,17 @@ OUString MapFamilyToCommand( const OUString& rFamily )
     if ( rFamily == "ParagraphStyles" ||
          rFamily == "CellStyles" ||         // In sc
          rFamily == "graphics" )            // In sd
-        return OUString( ".uno:ParaStyle" );
+        return ".uno:ParaStyle";
     else if ( rFamily == "CharacterStyles" )
-        return OUString( ".uno:CharStyle" );
+        return ".uno:CharStyle";
     else if ( rFamily == "PageStyles" )
-        return OUString( ".uno:PageStyle" );
+        return ".uno:PageStyle";
     else if ( rFamily == "FrameStyles" )
-        return OUString( ".uno:FrameStyle" );
+        return ".uno:FrameStyle";
     else if ( rFamily == "NumberingStyles" )
-        return OUString( ".uno:ListStyle" );
+        return ".uno:ListStyle";
     else if ( rFamily == "TableStyles" )
-        return OUString( ".uno:TableStyle" );
+        return ".uno:TableStyle";
 
     return OUString();
 }
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx
index 2eb1897b8069..058cbeee3a3c 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -419,7 +419,7 @@ void SubToolBarController::dispose()
 
 OUString SubToolBarController::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.framework.SubToolBarController" );
+    return "com.sun.star.comp.framework.SubToolBarController";
 }
 
 sal_Bool SubToolBarController::supportsService( const OUString& rServiceName )
diff --git a/framework/source/uielement/thesaurusmenucontroller.cxx b/framework/source/uielement/thesaurusmenucontroller.cxx
index da833b1cf1e9..bfff4cb778a0 100644
--- a/framework/source/uielement/thesaurusmenucontroller.cxx
+++ b/framework/source/uielement/thesaurusmenucontroller.cxx
@@ -150,7 +150,7 @@ OUString ThesaurusMenuController::getThesImplName( const css::lang::Locale& rLoc
 
 OUString ThesaurusMenuController::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.framework.ThesaurusMenuController" );
+    return "com.sun.star.comp.framework.ThesaurusMenuController";
 }
 
 css::uno::Sequence< OUString > ThesaurusMenuController::getSupportedServiceNames()
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx
index a9b895589202..8ee041dea6eb 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -55,7 +55,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.AddonsToolBarFactory");
+        return "com.sun.star.comp.framework.AddonsToolBarFactory";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx
index 085062afd0f2..5756fb3465ca 100644
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.cxx
@@ -41,7 +41,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.StatusBarFactory");
+        return "com.sun.star.comp.framework.StatusBarFactory";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uifactory/toolbarfactory.cxx b/framework/source/uifactory/toolbarfactory.cxx
index cc44bfb58360..28a6da218250 100644
--- a/framework/source/uifactory/toolbarfactory.cxx
+++ b/framework/source/uifactory/toolbarfactory.cxx
@@ -39,7 +39,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.ToolBarFactory");
+        return "com.sun.star.comp.framework.ToolBarFactory";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx
index 335854e01685..61d2e3f5f921 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -239,7 +239,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.PopupMenuControllerFactory");
+        return "com.sun.star.comp.framework.PopupMenuControllerFactory";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
@@ -284,7 +284,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.ToolBarControllerFactory");
+        return "com.sun.star.comp.framework.ToolBarControllerFactory";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
@@ -329,7 +329,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.StatusBarControllerFactory");
+        return "com.sun.star.comp.framework.StatusBarControllerFactory";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index de9f6ce5d893..ff93a1e7d256 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -350,7 +350,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.UIElementFactoryManager");
+        return "com.sun.star.comp.framework.UIElementFactoryManager";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index 4dc65aa5a66c..4352bb7a8934 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -54,7 +54,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.framework.WindowContentFactoryManager");
+        return "com.sun.star.comp.framework.WindowContentFactoryManager";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index 6c50e40cf284..36dd1c34ff7b 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -252,7 +252,7 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im
 OUString AcceleratorConfigurationReader::implts_getErrorLineString()
 {
     if (!m_xLocator.is())
-        return OUString("Error during parsing XML. (No further info available ...)");
+        return "Error during parsing XML. (No further info available ...)";
 
     OUStringBuffer sMsg(256);
     sMsg.append("Error during parsing XML in\nline = ");