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

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

17 files changed, 145 insertions, 145 deletions

diff --git a/svtools/qa/unit/testHtmlWriter.cxx b/svtools/qa/unit/testHtmlWriter.cxx
index 86da936b8ce8..70ba5a50a6f2 100644
--- a/svtools/qa/unit/testHtmlWriter.cxx
+++ b/svtools/qa/unit/testHtmlWriter.cxx
@@ -26,7 +26,7 @@ OString extractFromStream(SvMemoryStream& rStream)
     rStream.WriteChar('\0');
     rStream.Flush();
     rStream.Seek(STREAM_SEEK_TO_BEGIN);
-    return OString(static_cast<const sal_Char*>(rStream.GetData()));
+    return static_cast<const sal_Char*>(rStream.GetData());
 }
 
 }
diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx
index 80502f069b25..822f93a356e5 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -303,7 +303,7 @@ sal_Int32 SvtRulerAccessible::getBackground(  )
 // XServiceInfo
 OUString SAL_CALL SvtRulerAccessible::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.ui.SvtRulerAccessible" );
+    return "com.sun.star.comp.ui.SvtRulerAccessible";
 }
 
 sal_Bool SAL_CALL SvtRulerAccessible::supportsService( const OUString& sServiceName )
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index df425a888250..86d952662e93 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -200,7 +200,7 @@ sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole()
 OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription()
 {
     ThrowIfDisposed();
-    return OUString( "ToolbarMenu" );
+    return "ToolbarMenu";
 }
 
 
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index c4f333f9b9c4..12a965280ece 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -262,7 +262,7 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole()
 OUString SAL_CALL ValueSetAcc::getAccessibleDescription()
 {
     ThrowIfDisposed();
-    return OUString( "ValueSet" );
+    return "ValueSet";
 }
 
 
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index 2879600544f7..7651eeecbede 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -143,7 +143,7 @@ void SAL_CALL SvFilterOptionsDialog::initialize(const uno::Sequence<uno::Any>& r
 // XServiceInfo
 OUString SAL_CALL SvFilterOptionsDialog::getImplementationName()
 {
-    return OUString( "com.sun.star.svtools.SvFilterOptionsDialog" );
+    return "com.sun.star.svtools.SvFilterOptionsDialog";
 }
 sal_Bool SAL_CALL SvFilterOptionsDialog::supportsService( const OUString& rServiceName )
 {
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index 602fbc16e1f8..bae898873953 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -140,7 +140,7 @@ void SAL_CALL GraphicRendererVCL::release()
 
 OUString SAL_CALL GraphicRendererVCL::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.graphic.GraphicRendererVCL" );
+    return "com.sun.star.comp.graphic.GraphicRendererVCL";
 }
 
 sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const OUString& ServiceName )
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx
index 3316efd32a42..e94403073477 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.cxx
@@ -210,7 +210,7 @@ void SAL_CALL ODocumentCloser::removeEventListener( const uno::Reference< lang::
 // XServiceInfo
 OUString SAL_CALL ODocumentCloser::getImplementationName(  )
 {
-    return OUString( "com.sun.star.comp.embed.DocumentCloser" );
+    return "com.sun.star.comp.embed.DocumentCloser";
 }
 
 sal_Bool SAL_CALL ODocumentCloser::supportsService( const OUString& ServiceName )
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx
index d602b681d123..63004c951004 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.cxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx
@@ -64,7 +64,7 @@ uno::Reference< embed::XHatchWindow > SAL_CALL OHatchWindowFactory::createHatchW
 
 OUString SAL_CALL OHatchWindowFactory::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.embed.HatchWindowFactory" );
+    return "com.sun.star.comp.embed.HatchWindowFactory";
 }
 
 sal_Bool SAL_CALL OHatchWindowFactory::supportsService( const OUString& ServiceName )
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 65632e04cb07..6ad98b2c6fb0 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -294,65 +294,65 @@ OUString AcceleratorExecute::impl_ts_findCommand(const css::awt::KeyEvent& aKey)
         switch( aKey.KeyCode )
         {
         case css::awt::Key::DELETE_TO_BEGIN_OF_LINE:
-            return OUString( ".uno:DelToStartOfLine" );
+            return ".uno:DelToStartOfLine";
         case css::awt::Key::DELETE_TO_END_OF_LINE:
-            return OUString( ".uno:DelToEndOfLine" );
+            return ".uno:DelToEndOfLine";
         case css::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH:
-            return OUString( ".uno:DelToStartOfPara" );
+            return ".uno:DelToStartOfPara";
         case css::awt::Key::DELETE_TO_END_OF_PARAGRAPH:
-            return OUString( ".uno:DelToEndOfPara" );
+            return ".uno:DelToEndOfPara";
         case css::awt::Key::DELETE_WORD_BACKWARD:
-            return OUString( ".uno:DelToStartOfWord" );
+            return ".uno:DelToStartOfWord";
         case css::awt::Key::DELETE_WORD_FORWARD:
-            return OUString( ".uno:DelToEndOfWord" );
+            return ".uno:DelToEndOfWord";
         case css::awt::Key::INSERT_LINEBREAK:
-            return OUString( ".uno:InsertLinebreak" );
+            return ".uno:InsertLinebreak";
         case css::awt::Key::INSERT_PARAGRAPH:
-            return OUString( ".uno:InsertPara" );
+            return ".uno:InsertPara";
         case css::awt::Key::MOVE_WORD_BACKWARD:
-            return OUString( ".uno:GoToPrevWord" );
+            return ".uno:GoToPrevWord";
         case css::awt::Key::MOVE_WORD_FORWARD:
-            return OUString( ".uno:GoToNextWord" );
+            return ".uno:GoToNextWord";
         case css::awt::Key::MOVE_TO_BEGIN_OF_LINE:
-            return OUString( ".uno:GoToStartOfLine" );
+            return ".uno:GoToStartOfLine";
         case css::awt::Key::MOVE_TO_END_OF_LINE:
-            return OUString( ".uno:GoToEndOfLine" );
+            return ".uno:GoToEndOfLine";
         case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH:
-            return OUString( ".uno:GoToStartOfPara" );
+            return ".uno:GoToStartOfPara";
         case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH:
-            return OUString( ".uno:GoToEndOfPara" );
+            return ".uno:GoToEndOfPara";
         case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT:
-            return OUString( ".uno:GoToStartOfDoc" );
+            return ".uno:GoToStartOfDoc";
         case css::awt::Key::MOVE_TO_END_OF_DOCUMENT:
-            return OUString( ".uno:GoToEndOfDoc" );
+            return ".uno:GoToEndOfDoc";
         case css::awt::Key::SELECT_BACKWARD:
-            return OUString( ".uno:CharLeftSel" );
+            return ".uno:CharLeftSel";
         case css::awt::Key::SELECT_FORWARD:
-            return OUString( ".uno:CharRightSel" );
+            return ".uno:CharRightSel";
         case css::awt::Key::SELECT_WORD_BACKWARD:
-            return OUString( ".uno:WordLeftSel" );
+            return ".uno:WordLeftSel";
         case css::awt::Key::SELECT_WORD_FORWARD:
-            return OUString( ".uno:WordRightSel" );
+            return ".uno:WordRightSel";
         case css::awt::Key::SELECT_WORD:
-            return OUString( ".uno:SelectWord" );
+            return ".uno:SelectWord";
         case css::awt::Key::SELECT_LINE:
             return OUString();
         case css::awt::Key::SELECT_PARAGRAPH:
-            return OUString( ".uno:SelectText" );
+            return ".uno:SelectText";
         case css::awt::Key::SELECT_TO_BEGIN_OF_LINE:
-            return OUString( ".uno:StartOfLineSel" );
+            return ".uno:StartOfLineSel";
         case css::awt::Key::SELECT_TO_END_OF_LINE:
-            return OUString( ".uno:EndOfLineSel" );
+            return ".uno:EndOfLineSel";
         case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH:
-            return OUString( ".uno:StartOfParaSel" );
+            return ".uno:StartOfParaSel";
         case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH:
-            return OUString( ".uno:EndOfParaSel" );
+            return ".uno:EndOfParaSel";
         case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT:
-            return OUString( ".uno:StartOfDocumentSel" );
+            return ".uno:StartOfDocumentSel";
         case css::awt::Key::SELECT_TO_END_OF_DOCUMENT:
-            return OUString( ".uno:EndOfDocumentSel" );
+            return ".uno:EndOfDocumentSel";
         case css::awt::Key::SELECT_ALL:
-            return OUString( ".uno:SelectAll" );
+            return ".uno:SelectAll";
         default:
             break;
         }
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index c459198daa3f..9026b65e62d8 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -487,97 +487,97 @@ static OUString GetImageNameFromList_Impl( SvImageId nImageId, bool bBig )
         switch (nImageId)
         {
             case SvImageId::Impress:
-                return OUString(BMP_IMPRESS_LC);
+                return BMP_IMPRESS_LC;
             case SvImageId::Bitmap:
-                return OUString(BMP_BITMAP_LC);
+                return BMP_BITMAP_LC;
             case SvImageId::Calc:
-                return OUString(BMP_CALC_LC);
+                return BMP_CALC_LC;
             case SvImageId::CalcTemplate:
-                return OUString(BMP_CALCTEMPLATE_LC);
+                return BMP_CALCTEMPLATE_LC;
             case SvImageId::Database:
-                return OUString(BMP_DATABASE_LC);
+                return BMP_DATABASE_LC;
             case SvImageId::ImpressTemplate:
-                return OUString(BMP_IMPRESSTEMPLATE_LC);
+                return BMP_IMPRESSTEMPLATE_LC;
             case SvImageId::GIF:
-                return OUString(BMP_GIF_LC);
+                return BMP_GIF_LC;
             case SvImageId::HTML:
-                return OUString(BMP_HTML_LC);
+                return BMP_HTML_LC;
             case SvImageId::JPG:
-                return OUString(BMP_JPG_LC);
+                return BMP_JPG_LC;
             case SvImageId::Math:
-                return OUString(BMP_MATH_LC);
+                return BMP_MATH_LC;
             case SvImageId::MathTemplate:
-                return OUString(BMP_MATHTEMPLATE_LC);
+                return BMP_MATHTEMPLATE_LC;
             case SvImageId::File:
-                return OUString(BMP_FILE_LC);
+                return BMP_FILE_LC;
             case SvImageId::PCD:
-                return OUString(BMP_PCD_LC);
+                return BMP_PCD_LC;
             case SvImageId::PCT:
-                return OUString(BMP_PCT_LC);
+                return BMP_PCT_LC;
             case SvImageId::PCX:
-                return OUString(BMP_PCX_LC);
+                return BMP_PCX_LC;
             case SvImageId::SIM:
-                return OUString(BMP_SIM_LC);
+                return BMP_SIM_LC;
             case SvImageId::TextFile:
-                return OUString(BMP_TEXTFILE_LC);
+                return BMP_TEXTFILE_LC;
             case SvImageId::TIFF:
-                return OUString(BMP_TIFF_LC);
+                return BMP_TIFF_LC;
             case SvImageId::WMF:
-                return OUString(BMP_WMF_LC);
+                return BMP_WMF_LC;
             case SvImageId::Writer:
-                return OUString(BMP_WRITER_LC);
+                return BMP_WRITER_LC;
             case SvImageId::WriterTemplate:
-                return OUString(BMP_WRITERTEMPLATE_LC);
+                return BMP_WRITERTEMPLATE_LC;
             case SvImageId::FixedDevice:
-                return OUString(BMP_FIXEDDEV_LC);
+                return BMP_FIXEDDEV_LC;
             case SvImageId::RemoveableDevice:
-                return OUString(BMP_REMOVABLEDEV_LC);
+                return BMP_REMOVABLEDEV_LC;
             case SvImageId::CDRomDevice:
-                return OUString(BMP_CDROMDEV_LC);
+                return BMP_CDROMDEV_LC;
             case SvImageId::NetworkDevice:
-                return OUString(BMP_NETWORKDEV_LC);
+                return BMP_NETWORKDEV_LC;
             case SvImageId::Table:
-                return OUString(BMP_TABLE_LC);
+                return BMP_TABLE_LC;
             case SvImageId::Folder:
-                return OUString(BMP_FOLDER_LC);
+                return BMP_FOLDER_LC;
             case SvImageId::DXF:
-                return OUString(BMP_DXF_LC);
+                return BMP_DXF_LC;
             case SvImageId::MET:
-                return OUString(BMP_MET_LC);
+                return BMP_MET_LC;
             case SvImageId::PNG:
-                return OUString(BMP_PNG_LC);
+                return BMP_PNG_LC;
             case SvImageId::SVM:
-                return OUString(BMP_SVM_LC);
+                return BMP_SVM_LC;
             case SvImageId::GlobalDoc:
-                return OUString(BMP_GLOBAL_DOC_LC);
+                return BMP_GLOBAL_DOC_LC;
             case SvImageId::Draw:
-                return OUString(BMP_DRAW_LC);
+                return BMP_DRAW_LC;
             case SvImageId::DrawTemplate:
-                return OUString(BMP_DRAWTEMPLATE_LC);
+                return BMP_DRAWTEMPLATE_LC;
             case SvImageId::OO_DatabaseDoc:
-                return OUString(BMP_OO_DATABASE_DOC_LC);
+                return BMP_OO_DATABASE_DOC_LC;
             case SvImageId::OO_DrawDoc:
-                return OUString(BMP_OO_DRAW_DOC_LC);
+                return BMP_OO_DRAW_DOC_LC;
             case SvImageId::OO_MathDoc:
-                return OUString(BMP_OO_MATH_DOC_LC);
+                return BMP_OO_MATH_DOC_LC;
             case SvImageId::OO_GlobalDoc:
-                return OUString(BMP_OO_GLOBAL_DOC_LC);
+                return BMP_OO_GLOBAL_DOC_LC;
             case SvImageId::OO_ImpressDoc:
-                return OUString(BMP_OO_IMPRESS_DOC_LC);
+                return BMP_OO_IMPRESS_DOC_LC;
             case SvImageId::OO_CalcDoc:
-                return OUString(BMP_OO_CALC_DOC_LC);
+                return BMP_OO_CALC_DOC_LC;
             case SvImageId::OO_WriterDoc:
-                return OUString(BMP_OO_WRITER_DOC_LC);
+                return BMP_OO_WRITER_DOC_LC;
             case SvImageId::OO_DrawTemplate:
-                return OUString(BMP_OO_DRAW_TEMPLATE_LC);
+                return BMP_OO_DRAW_TEMPLATE_LC;
             case SvImageId::OO_ImpressTemplate:
-                return OUString(BMP_OO_IMPRESS_TEMPLATE_LC);
+                return BMP_OO_IMPRESS_TEMPLATE_LC;
             case SvImageId::OO_CalcTemplate:
-                return OUString(BMP_OO_CALC_TEMPLATE_LC);
+                return BMP_OO_CALC_TEMPLATE_LC;
             case SvImageId::OO_WriterTemplate:
-                return OUString(BMP_OO_WRITER_TEMPLATE_LC);
+                return BMP_OO_WRITER_TEMPLATE_LC;
             case SvImageId::Extension:
-                return OUString(BMP_EXTENSION_LC);
+                return BMP_EXTENSION_LC;
             default: break;
         }
     }
@@ -586,98 +586,98 @@ static OUString GetImageNameFromList_Impl( SvImageId nImageId, bool bBig )
         switch (nImageId)
         {
             case SvImageId::Impress:
-                return OUString(BMP_IMPRESS_SC);
+                return BMP_IMPRESS_SC;
             case SvImageId::Bitmap:
-                return OUString(BMP_BITMAP_SC);
+                return BMP_BITMAP_SC;
             case SvImageId::Calc:
-                return OUString(BMP_CALC_SC);
+                return BMP_CALC_SC;
             case SvImageId::CalcTemplate:
-                return OUString(BMP_CALCTEMPLATE_SC);
+                return BMP_CALCTEMPLATE_SC;
             case SvImageId::Database:
-                return OUString(BMP_DATABASE_SC);
+                return BMP_DATABASE_SC;
             case SvImageId::ImpressTemplate:
-                return OUString(BMP_IMPRESSTEMPLATE_SC);
+                return BMP_IMPRESSTEMPLATE_SC;
             case SvImageId::GIF:
-                return OUString(BMP_GIF_SC);
+                return BMP_GIF_SC;
             case SvImageId::HTML:
-                return OUString(BMP_HTML_SC);
+                return BMP_HTML_SC;
             case SvImageId::JPG:
-                return OUString(BMP_JPG_SC);
+                return BMP_JPG_SC;
             case SvImageId::Math:
-                return OUString(BMP_MATH_SC);
+                return BMP_MATH_SC;
             case SvImageId::MathTemplate:
-                return OUString(BMP_MATHTEMPLATE_SC);
+                return BMP_MATHTEMPLATE_SC;
             case SvImageId::File:
-                return OUString(BMP_FILE_SC);
+                return BMP_FILE_SC;
             case SvImageId::PCD:
-                return OUString(BMP_PCD_SC);
+                return BMP_PCD_SC;
             case SvImageId::PCT:
-                return OUString(BMP_PCT_SC);
+                return BMP_PCT_SC;
             case SvImageId::PCX:
-                return OUString(BMP_PCX_SC);
+                return BMP_PCX_SC;
             case SvImageId::SIM:
-                return OUString(BMP_SIM_SC);
+                return BMP_SIM_SC;
             case SvImageId::TextFile:
-                return OUString(BMP_TEXTFILE_SC);
+                return BMP_TEXTFILE_SC;
             case SvImageId::TIFF:
-                return OUString(BMP_TIFF_SC);
+                return BMP_TIFF_SC;
             case SvImageId::WMF:
-                return OUString(BMP_WMF_SC);
+                return BMP_WMF_SC;
             case SvImageId::Writer:
-                return OUString(BMP_WRITER_SC);
+                return BMP_WRITER_SC;
             case SvImageId::WriterTemplate:
-                return OUString(BMP_WRITERTEMPLATE_SC);
+                return BMP_WRITERTEMPLATE_SC;
             case SvImageId::FixedDevice:
-                return OUString(BMP_FIXEDDEV_SC);
+                return BMP_FIXEDDEV_SC;
             case SvImageId::RemoveableDevice:
-                return OUString(BMP_REMOVABLEDEV_SC);
+                return BMP_REMOVABLEDEV_SC;
             case SvImageId::CDRomDevice:
-                return OUString(BMP_CDROMDEV_SC);
+                return BMP_CDROMDEV_SC;
             case SvImageId::NetworkDevice:
-                return OUString(BMP_NETWORKDEV_SC);
+                return BMP_NETWORKDEV_SC;
             case SvImageId::Table:
-                return OUString(BMP_TABLE_SC);
+                return BMP_TABLE_SC;
             case SvImageId::Folder:
                 // if not bBig, then return our new small folder image (256 colors)
-                return OUString(RID_BMP_FOLDER);
+                return RID_BMP_FOLDER;
             case SvImageId::DXF:
-                return OUString(BMP_DXF_SC);
+                return BMP_DXF_SC;
             case SvImageId::MET:
-                return OUString(BMP_MET_SC);
+                return BMP_MET_SC;
             case SvImageId::PNG:
-                return OUString(BMP_PNG_SC);
+                return BMP_PNG_SC;
             case SvImageId::SVM:
-                return OUString(BMP_SVM_SC);
+                return BMP_SVM_SC;
             case SvImageId::GlobalDoc:
-                return OUString(BMP_GLOBAL_DOC_SC);
+                return BMP_GLOBAL_DOC_SC;
             case SvImageId::Draw:
-                return OUString(BMP_DRAW_SC);
+                return BMP_DRAW_SC;
             case SvImageId::DrawTemplate:
-                return OUString(BMP_DRAWTEMPLATE_SC);
+                return BMP_DRAWTEMPLATE_SC;
             case SvImageId::OO_DatabaseDoc:
-                return OUString(BMP_OO_DATABASE_DOC_SC);
+                return BMP_OO_DATABASE_DOC_SC;
             case SvImageId::OO_DrawDoc:
-                return OUString(BMP_OO_DRAW_DOC_SC);
+                return BMP_OO_DRAW_DOC_SC;
             case SvImageId::OO_MathDoc:
-                return OUString(BMP_OO_MATH_DOC_SC);
+                return BMP_OO_MATH_DOC_SC;
             case SvImageId::OO_GlobalDoc:
-                return OUString(BMP_OO_GLOBAL_DOC_SC);
+                return BMP_OO_GLOBAL_DOC_SC;
             case SvImageId::OO_ImpressDoc:
-                return OUString(BMP_OO_IMPRESS_DOC_SC);
+                return BMP_OO_IMPRESS_DOC_SC;
             case SvImageId::OO_CalcDoc:
-                return OUString(BMP_OO_CALC_DOC_SC);
+                return BMP_OO_CALC_DOC_SC;
             case SvImageId::OO_WriterDoc:
-                return OUString(BMP_OO_WRITER_DOC_SC);
+                return BMP_OO_WRITER_DOC_SC;
             case SvImageId::OO_DrawTemplate:
-                return OUString(BMP_OO_DRAW_TEMPLATE_SC);
+                return BMP_OO_DRAW_TEMPLATE_SC;
             case SvImageId::OO_ImpressTemplate:
-                return OUString(BMP_OO_IMPRESS_TEMPLATE_SC);
+                return BMP_OO_IMPRESS_TEMPLATE_SC;
             case SvImageId::OO_CalcTemplate:
-                return OUString(BMP_OO_CALC_TEMPLATE_SC);
+                return BMP_OO_CALC_TEMPLATE_SC;
             case SvImageId::OO_WriterTemplate:
-                return OUString(BMP_OO_WRITER_TEMPLATE_SC);
+                return BMP_OO_WRITER_TEMPLATE_SC;
             case SvImageId::Extension:
-                return OUString(BMP_EXTENSION_SC);
+                return BMP_EXTENSION_SC;
             default: break;
         }
     }
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 2a9a25c067d8..1a72110773fd 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -383,7 +383,7 @@ namespace svt { namespace table
 
     OUString TableControl::GetRowDescription( sal_Int32) const
     {
-        return OUString( "row description" );
+        return "row description";
     }
 
 
@@ -397,7 +397,7 @@ namespace svt { namespace table
 
     OUString TableControl::GetColumnDescription( sal_uInt16) const
     {
-        return OUString( "col description" );
+        return "col description";
     }
 
 
diff --git a/svtools/source/uitest/uiobject.cxx b/svtools/source/uitest/uiobject.cxx
index 3c0a34b26a8d..a636f1c36d8a 100644
--- a/svtools/source/uitest/uiobject.cxx
+++ b/svtools/source/uitest/uiobject.cxx
@@ -38,7 +38,7 @@ StringMap SimpleTableUIObject::get_state()
 
 OUString SimpleTableUIObject::get_type() const
 {
-    return OUString("SimpleTable");
+    return "SimpleTable";
 }
 
 std::unique_ptr<UIObject> SimpleTableUIObject::createFromContainer(vcl::Window* pWindow)
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index c6086c141954..eadefa255584 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -97,7 +97,7 @@ namespace {
 
     OUString SAL_CALL OAddressBookSourceDialogUno::getImplementationName()
     {
-        return OUString( "com.sun.star.comp.svtools.OAddressBookSourceDialogUno" );
+        return "com.sun.star.comp.svtools.OAddressBookSourceDialogUno";
     }
 
 
diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx
index 8ca591e1f692..1628d21f1d1c 100644
--- a/svtools/source/uno/fpicker.cxx
+++ b/svtools/source/uno/fpicker.cxx
@@ -40,9 +40,9 @@ static OUString FilePicker_getSystemPickerServiceName()
 #ifdef UNX
     OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
     if (aDesktopEnvironment.equalsIgnoreAsciiCase("macosx"))
-        return OUString ("com.sun.star.ui.dialogs.AquaFilePicker");
+        return "com.sun.star.ui.dialogs.AquaFilePicker";
     else
-        return OUString ("com.sun.star.ui.dialogs.SystemFilePicker");
+        return "com.sun.star.ui.dialogs.SystemFilePicker";
 #endif
 #ifdef _WIN32
     return OUString ("com.sun.star.ui.dialogs.Win32FilePicker");
@@ -95,7 +95,7 @@ Reference< css::uno::XInterface > FilePicker_CreateInstance (
 
 OUString FilePicker_getImplementationName()
 {
-    return OUString("com.sun.star.comp.svt.FilePicker");
+    return "com.sun.star.comp.svt.FilePicker";
 }
 
 Sequence< OUString > FilePicker_getSupportedServiceNames()
@@ -112,9 +112,9 @@ static OUString FolderPicker_getSystemPickerServiceName()
 #ifdef UNX
     OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
     if (aDesktopEnvironment.equalsIgnoreAsciiCase("macosx"))
-        return OUString("com.sun.star.ui.dialogs.AquaFolderPicker");
+        return "com.sun.star.ui.dialogs.AquaFolderPicker";
 #endif
-    return OUString("com.sun.star.ui.dialogs.SystemFolderPicker");
+    return "com.sun.star.ui.dialogs.SystemFolderPicker";
 }
 
 Reference< css::uno::XInterface > FolderPicker_CreateInstance (
@@ -160,7 +160,7 @@ Reference< css::uno::XInterface > FolderPicker_CreateInstance (
 
 OUString FolderPicker_getImplementationName()
 {
-    return OUString("com.sun.star.comp.svt.FolderPicker");
+    return "com.sun.star.comp.svt.FolderPicker";
 }
 
 Sequence< OUString > FolderPicker_getSupportedServiceNames()
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index dfd43f93d46a..91e1a880f613 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -406,7 +406,7 @@ sal_Int16 SvDetachedEventDescriptor::getIndex(const SvMacroItemId nID) const
 
 OUString SvDetachedEventDescriptor::getImplementationName()
 {
-    return OUString("SvDetachedEventDescriptor");
+    return "SvDetachedEventDescriptor";
 }
 
 
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index cba13aef070d..5bc83c726e49 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -386,11 +386,11 @@ OUString SAL_CALL SvUnoImageMapObject::getImplementationName()
     {
     case IMAP_OBJ_POLYGON:
     default:
-        return OUString("org.openoffice.comp.svt.ImageMapPolygonObject");
+        return "org.openoffice.comp.svt.ImageMapPolygonObject";
     case IMAP_OBJ_CIRCLE:
-        return OUString("org.openoffice.comp.svt.ImageMapCircleObject");
+        return "org.openoffice.comp.svt.ImageMapCircleObject";
     case IMAP_OBJ_RECTANGLE:
-        return OUString("org.openoffice.comp.svt.ImageMapRectangleObject");
+        return "org.openoffice.comp.svt.ImageMapRectangleObject";
     }
 }
 
@@ -650,7 +650,7 @@ sal_Bool SAL_CALL SvUnoImageMap::hasElements(  )
 // XSerivceInfo
 OUString SAL_CALL SvUnoImageMap::getImplementationName(  )
 {
-    return OUString( "org.openoffice.comp.svt.SvUnoImageMap" );
+    return "org.openoffice.comp.svt.SvUnoImageMap";
 }
 
 sal_Bool SAL_CALL SvUnoImageMap::supportsService( const OUString& ServiceName )
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 650ba4965c45..f3f9f28cd890 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -257,7 +257,7 @@ namespace {
 
     OUString SAL_CALL Wizard::getImplementationName()
     {
-        return OUString("com.sun.star.comp.svtools.uno.Wizard");
+        return "com.sun.star.comp.svtools.uno.Wizard";
     }