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

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

56 files changed, 157 insertions, 157 deletions

diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 4c4c87601a3b..47f4c41aff01 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -67,19 +67,19 @@ namespace
 {
     OUString lcl_getNamePropertyName( )
     {
-        return OUString( "Name" );
+        return "Name";
     }
     OUString lcl_getDescPropertyName( )
     {
-        return OUString( "HelpText" );
+        return "HelpText";
     }
     OUString lcl_getLabelPropertyName( )
     {
-        return OUString( "Label" );
+        return "Label";
     }
     OUString lcl_getLabelControlPropertyName( )
     {
-        return OUString("LabelControl");
+        return "LabelControl";
     }
     // return the property which should be used as AccessibleName
     const OUString lcl_getPreferredAccNameProperty( const Reference< XPropertySetInfo >& _rxPSI )
@@ -298,7 +298,7 @@ void SAL_CALL AccessibleControlShape::grabFocus()
 
 OUString SAL_CALL AccessibleControlShape::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.accessibility.AccessibleControlShape" );
+    return "com.sun.star.comp.accessibility.AccessibleControlShape";
 }
 
 OUString AccessibleControlShape::CreateAccessibleBaseName()
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index 2b8034ca55a2..04a7a9644ee1 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -97,7 +97,7 @@ void SAL_CALL
 OUString SAL_CALL
     AccessibleGraphicShape::getImplementationName()
 {
-    return OUString("AccessibleGraphicShape");
+    return "AccessibleGraphicShape";
 }
 
 
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx
index b2e76fd70074..5f4b03995665 100644
--- a/svx/source/accessibility/AccessibleOLEShape.cxx
+++ b/svx/source/accessibility/AccessibleOLEShape.cxx
@@ -102,7 +102,7 @@ void SAL_CALL
 OUString SAL_CALL
     AccessibleOLEShape::getImplementationName()
 {
-    return OUString("AccessibleOLEShape");
+    return "AccessibleOLEShape";
 }
 
 
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index bac37417d92a..fd6b7af7c028 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -315,7 +315,7 @@ OUString SAL_CALL AccessibleShape::getAccessibleDescription()
     if( m_pShape && !m_pShape->GetDescription().isEmpty())
         return m_pShape->GetDescription() ;
     else
-        return OUString(" ");
+        return " ";
 }
 
 // XAccessibleContext
@@ -877,7 +877,7 @@ uno::Any SAL_CALL AccessibleShape::getExtendedAttributes()
 OUString SAL_CALL
     AccessibleShape::getImplementationName()
 {
-    return OUString("AccessibleShape");
+    return "AccessibleShape";
 }
 
 
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index db79abc3f03b..cd90f449c9bb 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -491,7 +491,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground()
 // XServiceInfo
 OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.ui.SvxGraphCtrlAccessibleContext" );
+    return "com.sun.star.comp.ui.SvxGraphCtrlAccessibleContext";
 }
 
 sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString& sServiceName )
@@ -519,7 +519,7 @@ Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId()
 // XServiceName
 OUString SvxGraphCtrlAccessibleContext::getServiceName()
 {
-    return OUString( "com.sun.star.accessibility.AccessibleContext" );
+    return "com.sun.star.accessibility.AccessibleContext";
 }
 
 // XAccessibleSelection
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 1f89a39fb0b6..c90e60359610 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -524,7 +524,7 @@ sal_Bool SvxShowCharSetItemAcc::doAccessibleAction ( sal_Int32 nIndex )
 OUString SvxShowCharSetItemAcc::getAccessibleActionDescription ( sal_Int32 nIndex )
 {
     if( nIndex == 0 )
-        return OUString( "press" );
+        return "press";
     throw IndexOutOfBoundsException();
 }
 
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 55e1f2410d2e..2557ae3cf05f 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -587,7 +587,7 @@ OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_
     if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
         throw IndexOutOfBoundsException();
 
-    return OUString("select");
+    return "select";
 }
 
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 31cda0abcabd..7e7bcca224a8 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -135,7 +135,7 @@ void SAL_CALL EnhancedCustomShapeEngine::initialize( const Sequence< Any >& aArg
 // XServiceInfo
 OUString SAL_CALL EnhancedCustomShapeEngine::getImplementationName()
 {
-    return OUString( "com.sun.star.drawing.EnhancedCustomShapeEngine" );
+    return "com.sun.star.drawing.EnhancedCustomShapeEngine";
 }
 sal_Bool SAL_CALL EnhancedCustomShapeEngine::supportsService( const OUString& rServiceName )
 {
diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx
index 6dbe5dc41a54..895688d07b51 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -119,15 +119,15 @@ OUString classificationTypeToString(svx::ClassificationType const & reType)
     switch(reType)
     {
         case svx::ClassificationType::CATEGORY:
-            return OUString("CATEGORY"); break;
+            return "CATEGORY"; break;
         case svx::ClassificationType::MARKING:
-            return OUString("MARKING"); break;
+            return "MARKING"; break;
         case svx::ClassificationType::TEXT:
-            return OUString("TEXT"); break;
+            return "TEXT"; break;
         case svx::ClassificationType::INTELLECTUAL_PROPERTY_PART:
-            return OUString("INTELLECTUAL_PROPERTY_PART"); break;
+            return "INTELLECTUAL_PROPERTY_PART"; break;
         case svx::ClassificationType::PARAGRAPH:
-            return OUString("PARAGRAPH"); break;
+            return "PARAGRAPH"; break;
     }
     return OUString();
 }
diff --git a/svx/source/dialog/SafeModeUI.cxx b/svx/source/dialog/SafeModeUI.cxx
index d8e8ad9aad0c..970bef37ce47 100644
--- a/svx/source/dialog/SafeModeUI.cxx
+++ b/svx/source/dialog/SafeModeUI.cxx
@@ -43,7 +43,7 @@ SafeModeUI::SafeModeUI()
 
 OUString SAL_CALL SafeModeUI::getImplementationName()
 {
-    return OUString("com.sun.star.comp.svx.SafeModeUI");
+    return "com.sun.star.comp.svx.SafeModeUI";
 }
 
 sal_Bool SAL_CALL SafeModeUI::supportsService(const OUString& sServiceName)
diff --git a/svx/source/dialog/crashreportui.cxx b/svx/source/dialog/crashreportui.cxx
index 535124d96c50..5384e3c18c9a 100644
--- a/svx/source/dialog/crashreportui.cxx
+++ b/svx/source/dialog/crashreportui.cxx
@@ -45,7 +45,7 @@ CrashReportUI::CrashReportUI()
 
 OUString SAL_CALL CrashReportUI::getImplementationName()
 {
-    return OUString("com.sun.star.comp.svx.CrashReportUI");
+    return "com.sun.star.comp.svx.CrashReportUI";
 }
 
 sal_Bool SAL_CALL CrashReportUI::supportsService(const OUString& sServiceName)
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 007d1d8de543..5a18461de6a2 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -376,7 +376,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const OUString& ServiceName)
 
 OUString SAL_CALL FmXGridControl::getImplementationName()
 {
-    return OUString("com.sun.star.form.FmXGridControl");
+    return "com.sun.star.form.FmXGridControl";
 }
 
 css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedServiceNames()
@@ -404,7 +404,7 @@ void SAL_CALL FmXGridControl::dispose()
 
 OUString FmXGridControl::GetComponentServiceName()
 {
-    return OUString("DBGrid");
+    return "DBGrid";
 }
 
 
@@ -1024,7 +1024,7 @@ namespace fmgridif
 {
     static const OUString getDataModeIdentifier()
     {
-        return OUString("DataMode");
+        return "DataMode";
     }
 }
 using namespace fmgridif;
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 2f123a881f18..bddfc8827b6f 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -817,7 +817,7 @@ namespace svxform
             // XServiceInfo
             virtual OUString SAL_CALL getImplementationName() override
             {
-                return OUString("com.sun.star.comp.svx.StarBasicQuitGuard");
+                return "com.sun.star.comp.svx.StarBasicQuitGuard";
             }
 
             virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 5f796a94e9ab..0c896ef0436b 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -439,28 +439,28 @@ namespace
     {
         switch (nType)
         {
-            case OBJ_FM_EDIT            : return OUString(FM_COMPONENT_TEXTFIELD);
-            case OBJ_FM_BUTTON          : return OUString(FM_COMPONENT_COMMANDBUTTON);
-            case OBJ_FM_FIXEDTEXT       : return OUString(FM_COMPONENT_FIXEDTEXT);
-            case OBJ_FM_LISTBOX         : return OUString(FM_COMPONENT_LISTBOX);
-            case OBJ_FM_CHECKBOX        : return OUString(FM_COMPONENT_CHECKBOX);
-            case OBJ_FM_RADIOBUTTON     : return OUString(FM_COMPONENT_RADIOBUTTON);
-            case OBJ_FM_GROUPBOX        : return OUString(FM_COMPONENT_GROUPBOX);
-            case OBJ_FM_COMBOBOX        : return OUString(FM_COMPONENT_COMBOBOX);
-            case OBJ_FM_GRID            : return OUString(FM_COMPONENT_GRIDCONTROL);
-            case OBJ_FM_IMAGEBUTTON     : return OUString(FM_COMPONENT_IMAGEBUTTON);
-            case OBJ_FM_FILECONTROL     : return OUString(FM_COMPONENT_FILECONTROL);
-            case OBJ_FM_DATEFIELD       : return OUString(FM_COMPONENT_DATEFIELD);
-            case OBJ_FM_TIMEFIELD       : return OUString(FM_COMPONENT_TIMEFIELD);
-            case OBJ_FM_NUMERICFIELD    : return OUString(FM_COMPONENT_NUMERICFIELD);
-            case OBJ_FM_CURRENCYFIELD   : return OUString(FM_COMPONENT_CURRENCYFIELD);
-            case OBJ_FM_PATTERNFIELD    : return OUString(FM_COMPONENT_PATTERNFIELD);
-            case OBJ_FM_HIDDEN          : return OUString(FM_COMPONENT_HIDDENCONTROL);
-            case OBJ_FM_IMAGECONTROL    : return OUString(FM_COMPONENT_IMAGECONTROL);
-            case OBJ_FM_FORMATTEDFIELD  : return OUString(FM_COMPONENT_FORMATTEDFIELD);
-            case OBJ_FM_SCROLLBAR       : return OUString(FM_SUN_COMPONENT_SCROLLBAR);
-            case OBJ_FM_SPINBUTTON      : return OUString(FM_SUN_COMPONENT_SPINBUTTON);
-            case OBJ_FM_NAVIGATIONBAR   : return OUString(FM_SUN_COMPONENT_NAVIGATIONBAR);
+            case OBJ_FM_EDIT            : return FM_COMPONENT_TEXTFIELD;
+            case OBJ_FM_BUTTON          : return FM_COMPONENT_COMMANDBUTTON;
+            case OBJ_FM_FIXEDTEXT       : return FM_COMPONENT_FIXEDTEXT;
+            case OBJ_FM_LISTBOX         : return FM_COMPONENT_LISTBOX;
+            case OBJ_FM_CHECKBOX        : return FM_COMPONENT_CHECKBOX;
+            case OBJ_FM_RADIOBUTTON     : return FM_COMPONENT_RADIOBUTTON;
+            case OBJ_FM_GROUPBOX        : return FM_COMPONENT_GROUPBOX;
+            case OBJ_FM_COMBOBOX        : return FM_COMPONENT_COMBOBOX;
+            case OBJ_FM_GRID            : return FM_COMPONENT_GRIDCONTROL;
+            case OBJ_FM_IMAGEBUTTON     : return FM_COMPONENT_IMAGEBUTTON;
+            case OBJ_FM_FILECONTROL     : return FM_COMPONENT_FILECONTROL;
+            case OBJ_FM_DATEFIELD       : return FM_COMPONENT_DATEFIELD;
+            case OBJ_FM_TIMEFIELD       : return FM_COMPONENT_TIMEFIELD;
+            case OBJ_FM_NUMERICFIELD    : return FM_COMPONENT_NUMERICFIELD;
+            case OBJ_FM_CURRENCYFIELD   : return FM_COMPONENT_CURRENCYFIELD;
+            case OBJ_FM_PATTERNFIELD    : return FM_COMPONENT_PATTERNFIELD;
+            case OBJ_FM_HIDDEN          : return FM_COMPONENT_HIDDENCONTROL;
+            case OBJ_FM_IMAGECONTROL    : return FM_COMPONENT_IMAGECONTROL;
+            case OBJ_FM_FORMATTEDFIELD  : return FM_COMPONENT_FORMATTEDFIELD;
+            case OBJ_FM_SCROLLBAR       : return FM_SUN_COMPONENT_SCROLLBAR;
+            case OBJ_FM_SPINBUTTON      : return FM_SUN_COMPONENT_SPINBUTTON;
+            case OBJ_FM_NAVIGATIONBAR   : return FM_SUN_COMPONENT_NAVIGATIONBAR;
         }
         return OUString();
     }
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 96e993b6527c..6634c981616a 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -181,8 +181,8 @@ OUString CheckBoxWrapper::getCurrentText() const
 {
     switch (static_cast<TriState>(m_xBox->getState()))
     {
-        case TRISTATE_FALSE: return OUString("0");
-        case TRISTATE_TRUE: return OUString("1");
+        case TRISTATE_FALSE: return "0";
+        case TRISTATE_TRUE: return "1";
         default: break;
     }
     return OUString();
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 1dc951452899..9af97e6789dd 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -457,7 +457,7 @@ public:
     {
     }
 
-    virtual OUString GetComponentServiceName() override {return OUString("Edit");}
+    virtual OUString GetComponentServiceName() override {return "Edit";}
     virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) override;
 
 protected:
@@ -647,7 +647,7 @@ sal_Bool SAL_CALL FormController::supportsService(const OUString& ServiceName)
 
 OUString SAL_CALL FormController::getImplementationName()
 {
-    return OUString("org.openoffice.comp.svx.FormController");
+    return "org.openoffice.comp.svx.FormController";
 }
 
 Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames()
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index e234ef955de6..a310423da8d0 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -175,7 +175,7 @@ namespace svxform
 
     OUString SAL_CALL LegacyFormController::getImplementationName(  )
     {
-        return OUString( "org.openoffice.comp.svx.LegacyFormController" );
+        return "org.openoffice.comp.svx.LegacyFormController";
     }
 
     sal_Bool SAL_CALL LegacyFormController::supportsService( const OUString& _serviceName )
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index a99ae039a363..fecbc2d99c27 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -58,7 +58,7 @@ namespace svxform
 
     OUString OAddConditionDialog_GetImplementationName()
     {
-        return OUString("org.openoffice.comp.svx.OAddConditionDialog");
+        return "org.openoffice.comp.svx.OAddConditionDialog";
     }
 
     OAddConditionDialog::OAddConditionDialog( const Reference< XComponentContext >& _rxORB )
diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx
index 2780cf383f95..106234bde46c 100644
--- a/svx/source/mnuctrls/smarttagmenu.cxx
+++ b/svx/source/mnuctrls/smarttagmenu.cxx
@@ -218,7 +218,7 @@ IMPL_LINK( SmartTagMenuController, MenuSelect, Menu*, pMenu, bool )
 
 OUString SmartTagMenuController::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.svx.SmartTagMenuController" );
+    return "com.sun.star.comp.svx.SmartTagMenuController";
 }
 
 css::uno::Sequence< OUString > SmartTagMenuController::getSupportedServiceNames()
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index 8520b0ae0f16..0c094a2a19b7 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -49,7 +49,7 @@ public:
     virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) override;
 
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.comp.graphic.PrimitiveFactory2D"); }
+    { return "com.sun.star.comp.graphic.PrimitiveFactory2D"; }
 
     sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index 304ec88328dd..78d0113001a2 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -79,7 +79,7 @@ public:
         const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
 
     OUString SAL_CALL getImplementationName() override
-    { return OUString("org.apache.openoffice.comp.svx.sidebar.PanelFactory"); }
+    { return "org.apache.openoffice.comp.svx.sidebar.PanelFactory"; }
 
     sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 9dbab10e315b..cb0b545dc45b 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -672,48 +672,48 @@ OUString appendMarkerName(BitmapMarkerKind eKindOfMarker)
     switch(eKindOfMarker)
     {
         case BitmapMarkerKind::Rect_7x7:
-            return OUString("rect7");
+            return "rect7";
         case BitmapMarkerKind::Rect_9x9:
-            return OUString("rect9");
+            return "rect9";
         case BitmapMarkerKind::Rect_11x11:
-            return OUString("rect11");
+            return "rect11";
         case BitmapMarkerKind::Rect_13x13:
-            return OUString("rect13");
+            return "rect13";
         case BitmapMarkerKind::Circ_7x7:
         case BitmapMarkerKind::Customshape_7x7:
-            return OUString("circ7");
+            return "circ7";
         case BitmapMarkerKind::Circ_9x9:
         case BitmapMarkerKind::Customshape_9x9:
-            return OUString("circ9");
+            return "circ9";
         case BitmapMarkerKind::Circ_11x11:
         case BitmapMarkerKind::Customshape_11x11:
-            return OUString("circ11");
+            return "circ11";
         case BitmapMarkerKind::Elli_7x9:
-            return OUString("elli7x9");
+            return "elli7x9";
         case BitmapMarkerKind::Elli_9x11:
-            return OUString("elli9x11");
+            return "elli9x11";
         case BitmapMarkerKind::Elli_9x7:
-            return OUString("elli9x7");
+            return "elli9x7";
         case BitmapMarkerKind::Elli_11x9:
-            return OUString("elli11x9");
+            return "elli11x9";
         case BitmapMarkerKind::RectPlus_7x7:
-            return OUString("rectplus7");
+            return "rectplus7";
         case BitmapMarkerKind::RectPlus_9x9:
-            return OUString("rectplus9");
+            return "rectplus9";
         case BitmapMarkerKind::RectPlus_11x11:
-            return OUString("rectplus11");
+            return "rectplus11";
         case BitmapMarkerKind::Crosshair:
-            return OUString("cross");
+            return "cross";
         case BitmapMarkerKind::Anchor:
         case BitmapMarkerKind::AnchorTR:
-            return OUString("anchor");
+            return "anchor";
         case BitmapMarkerKind::AnchorPressed:
         case BitmapMarkerKind::AnchorPressedTR:
-            return OUString("anchor-pressed");
+            return "anchor-pressed";
         case BitmapMarkerKind::Glue:
-            return OUString("glue-selected");
+            return "glue-selected";
         case BitmapMarkerKind::Glue_Deselected:
-            return OUString("glue-unselected");
+            return "glue-unselected";
         default:
             break;
     }
@@ -725,17 +725,17 @@ OUString appendMarkerColor(BitmapColorIndex eIndex)
     switch(eIndex)
     {
         case BitmapColorIndex::LightGreen:
-            return OUString("1");
+            return "1";
         case BitmapColorIndex::Cyan:
-            return OUString("2");
+            return "2";
         case BitmapColorIndex::LightCyan:
-            return OUString("3");
+            return "3";
         case BitmapColorIndex::Red:
-            return OUString("4");
+            return "4";
         case BitmapColorIndex::LightRed:
-            return OUString("5");
+            return "5";
         case BitmapColorIndex::Yellow:
-            return OUString("6");
+            return "6";
         default:
             break;
     }
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 40a9bbdc4429..300ebe3677ce 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -126,25 +126,25 @@ OUString ImpItemListRow::GetItemTypeStr() const
 {
     switch(eItemType)
     {
-        case ItemType::BYTE      : return OUString("Byte");     break;
-        case ItemType::INT16     : return OUString("Int16");    break;
-        case ItemType::UINT16    : return OUString("UInt16");   break;
-        case ItemType::INT32     : return OUString("Int32");    break;
-        case ItemType::UINT32    : return OUString("UInt32");   break;
-        case ItemType::ENUM      : return OUString("Enum");     break;
-        case ItemType::BOOL      : return OUString("Bool");     break;
-        case ItemType::FLAG      : return OUString("Flag");     break;
-        case ItemType::STRING    : return OUString("String");   break;
-        case ItemType::POINT     : return OUString("Point");    break;
-        case ItemType::RECT      : return OUString("Rectangle");break;
-        case ItemType::RANGE     : return OUString("Range");    break;
-        case ItemType::FRACTION  : return OUString("Fraction"); break;
-        case ItemType::XCOLOR    : return OUString("XColor");   break;
-        case ItemType::COLOR     : return OUString("Color");    break;
-        case ItemType::FONT      : return OUString("Font");     break;
-        case ItemType::FONTHEIGHT: return OUString("FontHeight");break;
-        case ItemType::FONTWIDTH : return OUString("FontWidth"); break;
-        case ItemType::FIELD     : return OUString("Field");     break;
+        case ItemType::BYTE      : return "Byte";     break;
+        case ItemType::INT16     : return "Int16";    break;
+        case ItemType::UINT16    : return "UInt16";   break;
+        case ItemType::INT32     : return "Int32";    break;
+        case ItemType::UINT32    : return "UInt32";   break;
+        case ItemType::ENUM      : return "Enum";     break;
+        case ItemType::BOOL      : return "Bool";     break;
+        case ItemType::FLAG      : return "Flag";     break;
+        case ItemType::STRING    : return "String";   break;
+        case ItemType::POINT     : return "Point";    break;
+        case ItemType::RECT      : return "Rectangle";break;
+        case ItemType::RANGE     : return "Range";    break;
+        case ItemType::FRACTION  : return "Fraction"; break;
+        case ItemType::XCOLOR    : return "XColor";   break;
+        case ItemType::COLOR     : return "Color";    break;
+        case ItemType::FONT      : return "Font";     break;
+        case ItemType::FONTHEIGHT: return "FontHeight";break;
+        case ItemType::FONTWIDTH : return "FontWidth"; break;
+        case ItemType::FIELD     : return "Field";     break;
         default: break;
     }
 
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 9762801c5224..4f87f9ca8b47 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -466,7 +466,7 @@ void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAc
 
 OUString SAL_CALL AccessibleCell::getImplementationName()
 {
-    return OUString("AccessibleCell");
+    return "AccessibleCell";
 }
 
 
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 96488136caaf..bab37ae9ffc5 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -391,13 +391,13 @@ void SAL_CALL AccessibleTableShape::release(  ) throw ()
 
 OUString SAL_CALL AccessibleTableShape::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.accessibility.AccessibleTableShape" );
+    return "com.sun.star.comp.accessibility.AccessibleTableShape";
 }
 
 
 OUString AccessibleTableShape::CreateAccessibleBaseName()
 {
-    return OUString("TableShape");
+    return "TableShape";
 }
 
 
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index ea8e82f8b22f..a27a8d810fc0 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -204,7 +204,7 @@ const CellStyleNameMap& TableDesignStyle::getCellStyleNameMap()
 // XServiceInfo
 OUString SAL_CALL TableDesignStyle::getImplementationName()
 {
-    return OUString("TableDesignStyle");
+    return "TableDesignStyle";
 }
 
 sal_Bool SAL_CALL TableDesignStyle::supportsService( const OUString& ServiceName )
@@ -454,7 +454,7 @@ void SAL_CALL TableDesignStyle::disposing( const css::lang::EventObject& )
 // XServiceInfo
 OUString SAL_CALL TableDesignFamily::getImplementationName()
 {
-    return OUString("TableDesignFamily");
+    return "TableDesignFamily";
 }
 
 sal_Bool SAL_CALL TableDesignFamily::supportsService( const OUString& ServiceName )
@@ -472,7 +472,7 @@ Sequence< OUString > SAL_CALL TableDesignFamily::getSupportedServiceNames()
 // XNamed
 OUString SAL_CALL TableDesignFamily::getName()
 {
-    return OUString( "table" );
+    return "table";
 }
 
 void SAL_CALL TableDesignFamily::setName( const OUString& )
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index 7c4f9f670097..443b29ebdc20 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -217,7 +217,7 @@ void SAL_CALL NumberingToolBoxControl::initialize( const css::uno::Sequence< css
 
 OUString SAL_CALL NumberingToolBoxControl::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.svx.NumberingToolBoxControl" );
+    return "com.sun.star.comp.svx.NumberingToolBoxControl";
 }
 
 css::uno::Sequence< OUString > SAL_CALL NumberingToolBoxControl::getSupportedServiceNames()
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index af83529bc620..db308b2e5caa 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -322,7 +322,7 @@ void SAL_CALL ExtrusionDirectionControl::initialize( const css::uno::Sequence< c
 
 OUString ExtrusionDirectionControl::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.svx.ExtrusionDirectionController" );
+    return "com.sun.star.comp.svx.ExtrusionDirectionController";
 }
 
 
@@ -559,7 +559,7 @@ void SAL_CALL ExtrusionDepthController::initialize( const css::uno::Sequence< cs
 
 OUString ExtrusionDepthController::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.svx.ExtrusionDepthController" );
+    return "com.sun.star.comp.svx.ExtrusionDepthController";
 }
 
 
@@ -810,7 +810,7 @@ void SAL_CALL ExtrusionLightingControl::initialize( const css::uno::Sequence< cs
 
 OUString ExtrusionLightingControl::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.svx.ExtrusionLightingController" );
+    return "com.sun.star.comp.svx.ExtrusionLightingController";
 }
 
 
@@ -936,7 +936,7 @@ void SAL_CALL ExtrusionSurfaceControl::initialize( const css::uno::Sequence< css
 
 OUString ExtrusionSurfaceControl::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.svx.ExtrusionSurfaceController" );
+    return "com.sun.star.comp.svx.ExtrusionSurfaceController";
 }
 
 
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 7d9c5b974438..37e1eb8c8461 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -395,7 +395,7 @@ void SAL_CALL FontworkAlignmentControl::initialize( const css::uno::Sequence< cs
 
 OUString FontworkAlignmentControl::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.svx.FontworkAlignmentController" );
+    return "com.sun.star.comp.svx.FontworkAlignmentController";
 }
 
 
@@ -608,7 +608,7 @@ void SAL_CALL FontworkCharacterSpacingControl::initialize( const css::uno::Seque
 
 OUString FontworkCharacterSpacingControl::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.svx.FontworkCharacterSpacingController" );
+    return "com.sun.star.comp.svx.FontworkCharacterSpacingController";
 }
 
 
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index e09e812ee249..0704b88006dc 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -496,7 +496,7 @@ VclPtr<vcl::Window> SvxLineEndToolBoxControl::createPopupWindow( vcl::Window* pP
 
 OUString SvxLineEndToolBoxControl::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.svx.LineEndToolBoxControl" );
+    return "com.sun.star.comp.svx.LineEndToolBoxControl";
 }
 
 css::uno::Sequence<OUString> SvxLineEndToolBoxControl::getSupportedServiceNames()
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 185fae3746d1..fcae1fb8342b 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3309,7 +3309,7 @@ void SvxFontNameToolBoxControl::dispose()
 
 OUString SvxFontNameToolBoxControl::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.svx.FontNameToolBoxControl" );
+    return "com.sun.star.comp.svx.FontNameToolBoxControl";
 }
 
 sal_Bool SvxFontNameToolBoxControl::supportsService( const OUString& rServiceName )
@@ -3550,7 +3550,7 @@ void SvxColorToolBoxControl::functionSelected( const OUString& /*rCommand*/ )
 
 OUString SvxColorToolBoxControl::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.svx.ColorToolBoxControl" );
+    return "com.sun.star.comp.svx.ColorToolBoxControl";
 }
 
 css::uno::Sequence<OUString> SvxColorToolBoxControl::getSupportedServiceNames()
@@ -3609,7 +3609,7 @@ VclPtr<vcl::Window> SvxFrameToolBoxControl::createPopupWindow( vcl::Window* pPar
 
 OUString SvxFrameToolBoxControl::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.svx.FrameToolBoxControl" );
+    return "com.sun.star.comp.svx.FrameToolBoxControl";
 }
 
 css::uno::Sequence< OUString > SvxFrameToolBoxControl::getSupportedServiceNames()
@@ -3714,7 +3714,7 @@ void SvxCurrencyToolBoxControl::execute( sal_Int16 nSelectModifier )
 
 OUString SvxCurrencyToolBoxControl::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.svx.CurrencyToolBoxControl" );
+    return "com.sun.star.comp.svx.CurrencyToolBoxControl";
 }
 
 css::uno::Sequence<OUString> SvxCurrencyToolBoxControl::getSupportedServiceNames()
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 628a9585e922..b806251dd805 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -303,7 +303,7 @@ sal_Bool SAL_CALL FontHeightToolBoxControl::supportsService( const OUString& Ser
 
 OUString SAL_CALL FontHeightToolBoxControl::getImplementationName()
 {
-    return OUString("com.sun.star.svx.FontHeightToolBoxController");
+    return "com.sun.star.svx.FontHeightToolBoxController";
 }
 
 uno::Sequence< OUString > SAL_CALL FontHeightToolBoxControl::getSupportedServiceNames(  )
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 0d948d66fdf9..1beda67e61d6 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -489,7 +489,7 @@ void SAL_CALL FindTextToolbarController::release() throw ()
 // XServiceInfo
 OUString SAL_CALL FindTextToolbarController::getImplementationName()
 {
-    return OUString("com.sun.star.svx.FindTextToolboxController");
+    return "com.sun.star.svx.FindTextToolboxController";
 }
 
 sal_Bool SAL_CALL FindTextToolbarController::supportsService( const OUString& ServiceName )
@@ -771,7 +771,7 @@ void SAL_CALL MatchCaseToolboxController::release() throw ()
 // XServiceInfo
 OUString SAL_CALL MatchCaseToolboxController::getImplementationName()
 {
-    return OUString( "com.sun.star.svx.MatchCaseToolboxController" );
+    return "com.sun.star.svx.MatchCaseToolboxController";
 }
 
 sal_Bool SAL_CALL MatchCaseToolboxController::supportsService( const OUString& ServiceName )
@@ -890,7 +890,7 @@ void SAL_CALL SearchFormattedToolboxController::release() throw ()
 // XServiceInfo
 OUString SAL_CALL SearchFormattedToolboxController::getImplementationName()
 {
-    return OUString( "com.sun.star.svx.SearchFormattedToolboxController" );
+    return "com.sun.star.svx.SearchFormattedToolboxController";
 }
 
 sal_Bool SAL_CALL SearchFormattedToolboxController::supportsService( const OUString& ServiceName )
@@ -1005,7 +1005,7 @@ void SAL_CALL FindAllToolboxController::release() throw ()
 // XServiceInfo
 OUString SAL_CALL FindAllToolboxController::getImplementationName()
 {
-    return OUString( "com.sun.star.svx.FindAllToolboxController" );
+    return "com.sun.star.svx.FindAllToolboxController";
 }
 
 
@@ -1112,7 +1112,7 @@ void SAL_CALL ExitSearchToolboxController::release() throw ()
 // XServiceInfo
 OUString SAL_CALL ExitSearchToolboxController::getImplementationName()
 {
-    return OUString( "com.sun.star.svx.ExitFindbarToolboxController" );
+    return "com.sun.star.svx.ExitFindbarToolboxController";
 }
 
 
@@ -1233,7 +1233,7 @@ void SAL_CALL SearchLabelToolboxController::release() throw ()
 // XServiceInfo
 OUString SAL_CALL SearchLabelToolboxController::getImplementationName()
 {
-    return OUString( "com.sun.star.svx.SearchLabelToolboxController" );
+    return "com.sun.star.svx.SearchLabelToolboxController";
 }
 
 
@@ -1362,7 +1362,7 @@ void SAL_CALL FindbarDispatcher::release() throw()
 // XServiceInfo
 OUString SAL_CALL FindbarDispatcher::getImplementationName()
 {
-    return OUString("com.sun.star.comp.svx.Impl.FindbarDispatcher");
+    return "com.sun.star.comp.svx.Impl.FindbarDispatcher";
 }
 
 sal_Bool SAL_CALL FindbarDispatcher::supportsService( const OUString& ServiceName )
diff --git a/svx/source/uitest/sdrobject.cxx b/svx/source/uitest/sdrobject.cxx
index 2f0b05096a04..3ceb01591e8e 100644
--- a/svx/source/uitest/sdrobject.cxx
+++ b/svx/source/uitest/sdrobject.cxx
@@ -158,7 +158,7 @@ void SdrUIObject::execute(const OUString& rAction,
 
 OUString SdrUIObject::get_type() const
 {
-    return OUString("SdrUIObject");
+    return "SdrUIObject";
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/uitest/uiobject.cxx b/svx/source/uitest/uiobject.cxx
index 9568f4cc75ef..c791dc068395 100644
--- a/svx/source/uitest/uiobject.cxx
+++ b/svx/source/uitest/uiobject.cxx
@@ -56,7 +56,7 @@ std::unique_ptr<UIObject> SvxShowCharSetUIObject::create(vcl::Window* pWindow)
 
 OUString SvxShowCharSetUIObject::get_name() const
 {
-    return OUString("SvxShowCharSetUIObject");
+    return "SvxShowCharSetUIObject";
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index d4231e33174e..27ae4e6002e5 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -62,7 +62,7 @@ OUString SAL_CALL ChineseTranslation_UnoDialog::getImplementationName()
 
 OUString ChineseTranslation_UnoDialog::getImplementationName_Static()
 {
-    return OUString("com.sun.star.comp.linguistic2.ChineseTranslationDialog");
+    return "com.sun.star.comp.linguistic2.ChineseTranslationDialog";
 }
 
 sal_Bool SAL_CALL ChineseTranslation_UnoDialog::supportsService( const OUString& ServiceName )
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 455fc4fadf40..da22962311df 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -1223,7 +1223,7 @@ void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XCompon
 // XServiceInfo
 OUString SAL_CALL GraphicExporter::getImplementationName(  )
 {
-    return OUString( "com.sun.star.comp.Draw.GraphicExporter" );
+    return "com.sun.star.comp.Draw.GraphicExporter";
 }
 
 sal_Bool SAL_CALL GraphicExporter::supportsService( const OUString& ServiceName )
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index 05dabe2052ee..3bf56c17707f 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -83,7 +83,7 @@ namespace svx
     static OUString NamespaceMap_getImplementationName()
         throw()
     {
-        return OUString( "com.sun.star.comp.Svx.NamespaceMap" );
+        return "com.sun.star.comp.Svx.NamespaceMap";
     }
 
 
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 31b000dd92aa..02bcc3f23378 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -277,7 +277,7 @@ uno::Type SAL_CALL SvxUnoXColorTable::getElementType()
 // XServiceInfo
 OUString SAL_CALL SvxUnoXColorTable::getImplementationName(  )
 {
-    return OUString( "SvxUnoXColorTable" );
+    return "SvxUnoXColorTable";
 }
 
 uno::Sequence<  OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames(  )
@@ -344,7 +344,7 @@ uno::Type SAL_CALL SvxUnoXLineEndTable::getElementType()
 // XServiceInfo
 OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName(  )
 {
-    return OUString( "SvxUnoXLineEndTable" );
+    return "SvxUnoXLineEndTable";
 }
 
 uno::Sequence<  OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames(  )
@@ -421,7 +421,7 @@ uno::Type SAL_CALL SvxUnoXDashTable::getElementType()
 // XServiceInfo
 OUString SAL_CALL SvxUnoXDashTable::getImplementationName(  )
 {
-    return OUString( "SvxUnoXDashTable" );
+    return "SvxUnoXDashTable";
 }
 
 uno::Sequence<  OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames(  )
@@ -493,7 +493,7 @@ uno::Type SAL_CALL SvxUnoXHatchTable::getElementType()
 // XServiceInfo
 OUString SAL_CALL SvxUnoXHatchTable::getImplementationName(  )
 {
-    return OUString( "SvxUnoXHatchTable" );
+    return "SvxUnoXHatchTable";
 }
 
 uno::Sequence<  OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames(  )
@@ -577,7 +577,7 @@ uno::Type SAL_CALL SvxUnoXGradientTable::getElementType()
 // XServiceInfo
 OUString SAL_CALL SvxUnoXGradientTable::getImplementationName(  )
 {
-    return OUString( "SvxUnoXGradientTable" );
+    return "SvxUnoXGradientTable";
 }
 
 uno::Sequence<  OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames(  )
@@ -648,7 +648,7 @@ uno::Type SAL_CALL SvxUnoXBitmapTable::getElementType()
 // XServiceInfo
 OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName(  )
 {
-    return OUString( "SvxUnoXBitmapTable" );
+    return "SvxUnoXBitmapTable";
 }
 
 uno::Sequence<  OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames(  )
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 54f0047e50df..883cfa77cf1d 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -121,7 +121,7 @@ RecoveryUI::RecoveryUI(const css::uno::Reference< css::uno::XComponentContext >&
 
 OUString SAL_CALL RecoveryUI::getImplementationName()
 {
-    return OUString("com.sun.star.comp.svx.RecoveryUI");
+    return "com.sun.star.comp.svx.RecoveryUI";
 }
 
 sal_Bool SAL_CALL RecoveryUI::supportsService(const OUString& sServiceName)
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index ab1d48660d58..c80ffcb69f10 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -75,7 +75,7 @@ bool SvxUnoBitmapTable::isValid( const NameOrIndex* pItem ) const
 
 OUString SAL_CALL SvxUnoBitmapTable::getImplementationName()
 {
-    return OUString("SvxUnoBitmapTable");
+    return "SvxUnoBitmapTable";
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoBitmapTable::getSupportedServiceNames(  )
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index c5051395d546..a6fa3f74f316 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -76,7 +76,7 @@ sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const  OUString& ServiceNam
 
 OUString SAL_CALL SvxUnoColorTable::getImplementationName()
 {
-    return OUString("com.sun.star.drawing.SvxUnoColorTable");
+    return "com.sun.star.drawing.SvxUnoColorTable";
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames()
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index 0a7b66c217ef..c827a288fafe 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -55,7 +55,7 @@ SvxUnoDashTable::SvxUnoDashTable( SdrModel* pModel ) throw()
 
 OUString SAL_CALL SvxUnoDashTable::getImplementationName()
 {
-    return OUString("SvxUnoDashTable");
+    return "SvxUnoDashTable";
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoDashTable::getSupportedServiceNames(  )
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index 25f845fc18c9..f33d947fcd08 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -54,7 +54,7 @@ SvxUnoGradientTable::SvxUnoGradientTable( SdrModel* pModel ) throw()
 
 OUString SAL_CALL SvxUnoGradientTable::getImplementationName()
 {
-    return OUString("SvxUnoGradientTable");
+    return "SvxUnoGradientTable";
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoGradientTable::getSupportedServiceNames(  )
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index 1e272b371d41..8e21de8229bd 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -54,7 +54,7 @@ SvxUnoHatchTable::SvxUnoHatchTable( SdrModel* pModel ) throw()
 
 OUString SAL_CALL SvxUnoHatchTable::getImplementationName()
 {
-    return OUString("SvxUnoHatchTable");
+    return "SvxUnoHatchTable";
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoHatchTable::getSupportedServiceNames(  )
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 530d3983d5e2..92472f094fbb 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -523,7 +523,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames(
 // lang::XServiceInfo
 OUString SAL_CALL SvxUnoDrawingModel::getImplementationName()
 {
-    return OUString("SvxUnoDrawingModel");
+    return "SvxUnoDrawingModel";
 }
 
 sal_Bool SAL_CALL SvxUnoDrawingModel::supportsService( const OUString& ServiceName )
@@ -656,7 +656,7 @@ void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDra
 
 OUString SAL_CALL SvxUnoDrawPagesAccess::getImplementationName(  )
 {
-    return OUString( "SvxUnoDrawPagesAccess" );
+    return "SvxUnoDrawPagesAccess";
 }
 
 sal_Bool SAL_CALL SvxUnoDrawPagesAccess::supportsService( const OUString& ServiceName )
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index e9f821dc5a2e..227433a792ed 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -131,7 +131,7 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::supportsService( const  OUString& ServiceNa
 
 OUString SAL_CALL SvxUnoMarkerTable::getImplementationName()
 {
-    return OUString("SvxUnoMarkerTable");
+    return "SvxUnoMarkerTable";
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames(  )
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index fd718b69098c..44bb5c142d51 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -854,7 +854,7 @@ SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xS
 // css::lang::XServiceInfo
 OUString SAL_CALL SvxDrawPage::getImplementationName()
 {
-    return OUString("SvxDrawPage");
+    return "SvxDrawPage";
 }
 
 sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName )
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index d09758602172..4f0742bdce41 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -381,7 +381,7 @@ sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const  OUString& ServiceName
 
 OUString SAL_CALL SvxUnoDrawPool::getImplementationName()
 {
-    return OUString("SvxUnoDrawPool");
+    return "SvxUnoDrawPool";
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoDrawPool::getSupportedServiceNames(  )
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 586e0df35e9d..da9881ac3a64 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -3065,7 +3065,7 @@ uno::Sequence<uno::Any> SvxShape::getPropertyDefaults(
 
 OUString SAL_CALL SvxShape::getImplementationName()
 {
-    return OUString("SvxShape");
+    return "SvxShape";
 }
 
 const char sUNO_service_style_ParagraphProperties[]          = "com.sun.star.style.ParagraphProperties";
@@ -3897,7 +3897,7 @@ void SAL_CALL SvxShapeText::release() throw()
 
 OUString SAL_CALL SvxShapeText::getImplementationName()
 {
-    return OUString("SvxShapeText");
+    return "SvxShapeText";
 }
 
 
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index d59704051e5b..8f0c98ef9a6a 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -236,7 +236,7 @@ sal_Bool SAL_CALL SvxShapeCollection::hasElements()
 // XServiceInfo
 OUString SAL_CALL SvxShapeCollection::getImplementationName()
 {
-    return OUString("com.sun.star.drawing.SvxShapeCollection");
+    return "com.sun.star.drawing.SvxShapeCollection";
 }
 
 sal_Bool SAL_CALL SvxShapeCollection::supportsService( const OUString& ServiceName )
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index f1270f0da64e..2ad927a35716 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -54,7 +54,7 @@ SvxUnoTransGradientTable::SvxUnoTransGradientTable( SdrModel* pModel ) throw()
 
 OUString SAL_CALL SvxUnoTransGradientTable::getImplementationName()
 {
-    return OUString("SvxUnoTransGradientTable");
+    return "SvxUnoTransGradientTable";
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedServiceNames(  )
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index da2f64c9ae87..74023011d380 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -116,7 +116,7 @@ void SAL_CALL GalleryItem::release()
 
 OUString SAL_CALL GalleryItem::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.gallery.GalleryItem" );
+    return "com.sun.star.comp.gallery.GalleryItem";
 }
 
 sal_Bool SAL_CALL GalleryItem::supportsService( const OUString& ServiceName )
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 88a8bff8cae8..ef6d7c83c409 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -68,7 +68,7 @@ GalleryTheme::~GalleryTheme()
 
 OUString SAL_CALL GalleryTheme::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.gallery.GalleryTheme" );
+    return "com.sun.star.comp.gallery.GalleryTheme";
 }
 
 sal_Bool SAL_CALL GalleryTheme::supportsService( const OUString& ServiceName )
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index c55adb55b356..a0b72e997435 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -87,7 +87,7 @@ GalleryThemeProvider::GalleryThemeProvider() :
 
 OUString SAL_CALL GalleryThemeProvider::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.gallery.GalleryThemeProvider" );
+    return "com.sun.star.comp.gallery.GalleryThemeProvider";
 }
 
 sal_Bool SAL_CALL GalleryThemeProvider::supportsService( const OUString& ServiceName )
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 49272f3a404e..edbfb16c41f8 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -1091,8 +1091,8 @@ OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveOutputStream( const Ref
 OUString SAL_CALL SvXMLGraphicImportExportHelper::getImplementationName()
 {
     if( m_eGraphicHelperMode == SvXMLGraphicHelperMode::Read )
-        return OUString("com.sun.star.comp.Svx.GraphicImportHelper");
-    return OUString("com.sun.star.comp.Svx.GraphicExportHelper");
+        return "com.sun.star.comp.Svx.GraphicImportHelper";
+    return "com.sun.star.comp.Svx.GraphicExportHelper";
 }
 
 sal_Bool SAL_CALL SvXMLGraphicImportExportHelper::supportsService( const OUString& ServiceName )