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

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

24 files changed, 75 insertions, 75 deletions

diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx
index d669d7f32192..1d098085dfab 100644
--- a/filter/source/config/cache/configflush.cxx
+++ b/filter/source/config/cache/configflush.cxx
@@ -103,7 +103,7 @@ void SAL_CALL ConfigFlush::removeRefreshListener(const css::uno::Reference< css:
 
 OUString ConfigFlush::impl_getImplementationName()
 {
-    return OUString("com.sun.star.comp.filter.config.ConfigFlush");
+    return "com.sun.star.comp.filter.config.ConfigFlush";
 }
 
 
diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx
index 11ad89a99474..d24cd8e752d2 100644
--- a/filter/source/config/cache/contenthandlerfactory.cxx
+++ b/filter/source/config/cache/contenthandlerfactory.cxx
@@ -98,7 +98,7 @@ css::uno::Sequence< OUString > SAL_CALL ContentHandlerFactory::getAvailableServi
 
 OUString ContentHandlerFactory::impl_getImplementationName()
 {
-    return OUString( "com.sun.star.comp.filter.config.ContentHandlerFactory" );
+    return "com.sun.star.comp.filter.config.ContentHandlerFactory";
 }
 
 
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 9a7f4b52debc..06d273f2cbd3 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -503,7 +503,7 @@ std::vector<OUString> FilterFactory::impl_readSortedFilterListFromConfig(const O
 
 OUString FilterFactory::impl_getImplementationName()
 {
-    return OUString( "com.sun.star.comp.filter.config.FilterFactory" );
+    return "com.sun.star.comp.filter.config.FilterFactory";
 }
 
 
diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx
index 14b09a5fdb5a..45ebe511b49b 100644
--- a/filter/source/config/cache/frameloaderfactory.cxx
+++ b/filter/source/config/cache/frameloaderfactory.cxx
@@ -95,7 +95,7 @@ css::uno::Sequence< OUString > SAL_CALL FrameLoaderFactory::getAvailableServiceN
 
 OUString FrameLoaderFactory::impl_getImplementationName()
 {
-    return OUString( "com.sun.star.comp.filter.config.FrameLoaderFactory" );
+    return "com.sun.star.comp.filter.config.FrameLoaderFactory";
 }
 
 
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 06aa7ae565f4..1495f945fce9 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -1203,7 +1203,7 @@ bool TypeDetection::impl_validateAndSetFilterOnDescriptor(      utl::MediaDescri
 
 OUString TypeDetection::impl_getImplementationName()
 {
-    return OUString( "com.sun.star.comp.filter.config.TypeDetection" );
+    return "com.sun.star.comp.filter.config.TypeDetection";
 }
 
 
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index a04aede0add8..56ff9ee5938b 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::document;
 
 OUString SWFDialog_getImplementationName ()
 {
-    return OUString ( SERVICE_NAME );
+    return SERVICE_NAME;
 }
 
 
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index 4b614c3eabce..eac3e9385ad9 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -198,7 +198,7 @@ static OUString exportBackground(FlashExporter &aFlashExporter, const Reference<
     {
         osl_removeFile(fullpath.pData);
         if ( 0xffff == nCached )
-            return OUString("NULL");
+            return "NULL";
         else
             return "slide" + OUString::number(nCached+1) + OUString::createFromAscii(suffix) + ".swf";
     }
@@ -479,7 +479,7 @@ void SAL_CALL FlashExportFilter::initialize( const css::uno::Sequence< css::uno:
 
 OUString FlashExportFilter_getImplementationName ()
 {
-    return OUString ( "com.sun.star.comp.Impress.FlashExportFilter" );
+    return "com.sun.star.comp.Impress.FlashExportFilter";
 }
 
 Sequence< OUString > FlashExportFilter_getSupportedServiceNames(  )
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx b/filter/source/graphicfilter/idxf/dxfreprd.cxx
index d9254f5a1c9e..1bd789876fd4 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx
@@ -140,7 +140,7 @@ namespace {
 OUString getLODefaultLanguage()
 {
     if (utl::ConfigManager::IsFuzzing())
-        return OUString("en-US");
+        return "en-US";
 
     OUString result(officecfg::Office::Linguistic::General::DefaultLocale::get());
     if (result.isEmpty())
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 9486708c2995..5056dd73f077 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -7007,40 +7007,40 @@ static const char* GetInternalServerName_Impl( const SvGlobalName& aGlobName )
 OUString SvxMSDffManager::GetFilterNameFromClassID( const SvGlobalName& aGlobName )
 {
     if ( aGlobName == SvGlobalName( SO3_SW_OLE_EMBED_CLASSID_60 ) )
-        return OUString( "StarOffice XML (Writer)" );
+        return "StarOffice XML (Writer)";
 
     if ( aGlobName == SvGlobalName( SO3_SW_OLE_EMBED_CLASSID_8 ) )
-        return OUString( "writer8" );
+        return "writer8";
 
     if ( aGlobName == SvGlobalName( SO3_SC_OLE_EMBED_CLASSID_60 ) )
-        return OUString( "StarOffice XML (Calc)" );
+        return "StarOffice XML (Calc)";
 
     if ( aGlobName == SvGlobalName( SO3_SC_OLE_EMBED_CLASSID_8 ) )
-        return OUString( "calc8" );
+        return "calc8";
 
     if ( aGlobName == SvGlobalName( SO3_SIMPRESS_OLE_EMBED_CLASSID_60 ) )
-        return OUString( "StarOffice XML (Impress)" );
+        return "StarOffice XML (Impress)";
 
     if ( aGlobName == SvGlobalName( SO3_SIMPRESS_OLE_EMBED_CLASSID_8 ) )
-        return OUString( "impress8" );
+        return "impress8";
 
     if ( aGlobName == SvGlobalName( SO3_SDRAW_OLE_EMBED_CLASSID_60 ) )
-        return OUString( "StarOffice XML (Draw)" );
+        return "StarOffice XML (Draw)";
 
     if ( aGlobName == SvGlobalName( SO3_SDRAW_OLE_EMBED_CLASSID_8 ) )
-        return OUString( "draw8" );
+        return "draw8";
 
     if ( aGlobName == SvGlobalName( SO3_SM_OLE_EMBED_CLASSID_60 ) )
-        return OUString( "StarOffice XML (Math)" );
+        return "StarOffice XML (Math)";
 
     if ( aGlobName == SvGlobalName( SO3_SM_OLE_EMBED_CLASSID_8 ) )
-        return OUString( "math8" );
+        return "math8";
 
     if ( aGlobName == SvGlobalName( SO3_SCH_OLE_EMBED_CLASSID_60 ) )
-        return OUString( "StarOffice XML (Chart)" );
+        return "StarOffice XML (Chart)";
 
     if ( aGlobName == SvGlobalName( SO3_SCH_OLE_EMBED_CLASSID_8 ) )
-        return OUString( "chart8" );
+        return "chart8";
 
     return OUString();
 }
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index c64477f079d1..42907629bfaa 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -71,17 +71,17 @@ static SvGlobalName GetEmbeddedVersion( const SvGlobalName& aAppName )
 static OUString GetStorageType( const SvGlobalName& aEmbName )
 {
     if ( aEmbName == SvGlobalName( SO3_SM_OLE_EMBED_CLASSID_8 ) )
-        return OUString( "LibreOffice.MathDocument.1" );
+        return "LibreOffice.MathDocument.1";
     else if ( aEmbName == SvGlobalName( SO3_SW_OLE_EMBED_CLASSID_8 ) )
-        return OUString( "LibreOffice.WriterDocument.1" );
+        return "LibreOffice.WriterDocument.1";
     else if ( aEmbName == SvGlobalName( SO3_SC_OLE_EMBED_CLASSID_8 ) )
-        return OUString( "LibreOffice.CalcDocument.1" );
+        return "LibreOffice.CalcDocument.1";
     else if ( aEmbName == SvGlobalName( SO3_SDRAW_OLE_EMBED_CLASSID_8 ) )
-        return OUString( "LibreOffice.DrawDocument.1" );
+        return "LibreOffice.DrawDocument.1";
     else if ( aEmbName == SvGlobalName( SO3_SIMPRESS_OLE_EMBED_CLASSID_8 ) )
-        return OUString( "LibreOffice.ImpressDocument.1" );
+        return "LibreOffice.ImpressDocument.1";
     else if ( aEmbName == SvGlobalName( SO3_SCH_OLE_EMBED_CLASSID_8 ) )
-        return OUString("LibreOffice.ChartDocument.1");
+        return "LibreOffice.ChartDocument.1";
     return OUString();
 }
 
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index 2f0f0a25b3fe..ffebbaaf70e4 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -512,7 +512,7 @@ uno::Sequence< OUString > VBAMacroResolver_getSupportedServiceNames()
 
 OUString VBAMacroResolver_getImplementationName()
 {
-    return OUString( "com.sun.star.comp.vba.VBAMacroResolver" );
+    return "com.sun.star.comp.vba.VBAMacroResolver";
 }
 
 uno::Reference< uno::XInterface > VBAMacroResolver_createInstance( const uno::Reference< uno::XComponentContext >& )
diff --git a/filter/source/msfilter/rtfutil.cxx b/filter/source/msfilter/rtfutil.cxx
index 7e16cc87960d..cc42ecd08168 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -36,7 +36,7 @@ OString OutHex(sal_uLong nHex, sal_uInt8 nLen)
             *pStr += 39;
         nHex >>= 4;
     }
-    return OString(pStr);
+    return pStr;
 }
 
 // Ideally, this function should work on (sal_uInt32) Unicode scalar values
diff --git a/filter/source/msfilter/svxmsbas2.cxx b/filter/source/msfilter/svxmsbas2.cxx
index 6eb7b99ba216..8a4ce43f1914 100644
--- a/filter/source/msfilter/svxmsbas2.cxx
+++ b/filter/source/msfilter/svxmsbas2.cxx
@@ -74,7 +74,7 @@ ErrCode SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocSh)
 
 OUString SvxImportMSVBasic::GetMSBasicStorageName()
 {
-    return OUString( "_MS_VBA_Macros" );
+    return "_MS_VBA_Macros";
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index 15f416452773..a0ab8c6318ab 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -82,7 +82,7 @@ namespace filter {
                      const Sequence< OUString >& userData) override;
 
             OUString SAL_CALL getImplementationName() override
-            { return OUString("com.sun.star.comp.filter.OdfFlatXml"); }
+            { return "com.sun.star.comp.filter.OdfFlatXml"; }
 
             sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
             { return cppu::supportsService(this, ServiceName); }
@@ -204,7 +204,7 @@ OdfFlatXml::exporter(const Sequence< PropertyValue >& sourceData,
 
 OUString OdfFlatXml::impl_getImplementationName()
 {
-    return OUString("com.sun.star.comp.filter.OdfFlatXml");
+    return "com.sun.star.comp.filter.OdfFlatXml";
 }
 
 Sequence< OUString > OdfFlatXml::impl_getSupportedServiceNames()
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index f494759fb7bf..da1333cb14bb 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::beans;
 
 OUString PDFDialog_getImplementationName ()
 {
-    return OUString ( "com.sun.star.comp.PDF.PDFDialog" );
+    return "com.sun.star.comp.PDF.PDFDialog";
 }
 
 
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index f7bed8855d72..1051f2b1bd2b 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -237,7 +237,7 @@ void SAL_CALL PDFFilter::initialize( const css::uno::Sequence< css::uno::Any >&
 
 OUString PDFFilter_getImplementationName ()
 {
-    return OUString ( "com.sun.star.comp.PDF.PDFFilter" );
+    return "com.sun.star.comp.PDF.PDFFilter";
 }
 
 
diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx
index 2186921dc575..024ac40ea7fe 100644
--- a/filter/source/pdf/pdfinteract.cxx
+++ b/filter/source/pdf/pdfinteract.cxx
@@ -71,7 +71,7 @@ sal_Bool SAL_CALL PDFInteractionHandler::handleInteractionRequest( const Referen
 
 OUString PDFInteractionHandler_getImplementationName ()
 {
-    return OUString ( "com.sun.star.comp.PDF.PDFExportInteractionHandler" );
+    return "com.sun.star.comp.PDF.PDFExportInteractionHandler";
 }
 
 
diff --git a/filter/source/storagefilterdetect/filterdetect.cxx b/filter/source/storagefilterdetect/filterdetect.cxx
index 78a7ef12322d..45bfa1f6cdbf 100644
--- a/filter/source/storagefilterdetect/filterdetect.cxx
+++ b/filter/source/storagefilterdetect/filterdetect.cxx
@@ -41,34 +41,34 @@ namespace {
 OUString getInternalFromMediaType(const OUString& aMediaType)
 {
     // OpenDocument types
-    if (      aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII )                  return OUString("writer8");
-    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII )         return OUString("writer8_template");
-    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII )              return OUString("writerweb8_writer_template");
-    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII )           return OUString("writerglobal8");
-    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII )  return OUString("writerglobal8_template");
-    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII )               return OUString("draw8");
-    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII )      return OUString("draw8_template");
-    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII )          return OUString("impress8");
-    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII ) return OUString("impress8_template");
-    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII )           return OUString("calc8");
-    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII )  return OUString("calc8_template");
-    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII )                 return OUString("chart8");
-    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII )               return OUString("math8");
-    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII )          return OUString("StarBaseReportChart");
+    if (      aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII )                  return "writer8";
+    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII )         return "writer8_template";
+    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII )              return "writerweb8_writer_template";
+    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII )           return "writerglobal8";
+    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII )  return "writerglobal8_template";
+    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII )               return "draw8";
+    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII )      return "draw8_template";
+    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII )          return "impress8";
+    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII ) return "impress8_template";
+    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII )           return "calc8";
+    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII )  return "calc8_template";
+    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII )                 return "chart8";
+    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII )               return "math8";
+    else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII )          return "StarBaseReportChart";
 
     // OOo legacy types
-    else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_ASCII )           return OUString("writer_StarOffice_XML_Writer");
-    else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII )  return OUString("writer_StarOffice_XML_Writer_Template");
-    else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII )       return OUString("writer_web_StarOffice_XML_Writer_Web_Template");
-    else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII )    return OUString("writer_globaldocument_StarOffice_XML_Writer_GlobalDocument");
-    else if ( aMediaType == MIMETYPE_VND_SUN_XML_DRAW_ASCII )             return OUString("draw_StarOffice_XML_Draw");
-    else if ( aMediaType == MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE_ASCII )    return OUString("draw_StarOffice_XML_Draw_Template");
-    else if ( aMediaType == MIMETYPE_VND_SUN_XML_IMPRESS_ASCII )          return OUString("impress_StarOffice_XML_Impress");
-    else if ( aMediaType == MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII ) return OUString("impress_StarOffice_XML_Impress_Template");
-    else if ( aMediaType == MIMETYPE_VND_SUN_XML_CALC_ASCII )             return OUString("calc_StarOffice_XML_Calc");
-    else if ( aMediaType == MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII )    return OUString("calc_StarOffice_XML_Calc_Template");
-    else if ( aMediaType == MIMETYPE_VND_SUN_XML_CHART_ASCII )            return OUString("chart_StarOffice_XML_Chart");
-    else if ( aMediaType == MIMETYPE_VND_SUN_XML_MATH_ASCII )             return OUString("math_StarOffice_XML_Math");
+    else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_ASCII )           return "writer_StarOffice_XML_Writer";
+    else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII )  return "writer_StarOffice_XML_Writer_Template";
+    else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII )       return "writer_web_StarOffice_XML_Writer_Web_Template";
+    else if ( aMediaType == MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII )    return "writer_globaldocument_StarOffice_XML_Writer_GlobalDocument";
+    else if ( aMediaType == MIMETYPE_VND_SUN_XML_DRAW_ASCII )             return "draw_StarOffice_XML_Draw";
+    else if ( aMediaType == MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE_ASCII )    return "draw_StarOffice_XML_Draw_Template";
+    else if ( aMediaType == MIMETYPE_VND_SUN_XML_IMPRESS_ASCII )          return "impress_StarOffice_XML_Impress";
+    else if ( aMediaType == MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII ) return "impress_StarOffice_XML_Impress_Template";
+    else if ( aMediaType == MIMETYPE_VND_SUN_XML_CALC_ASCII )             return "calc_StarOffice_XML_Calc";
+    else if ( aMediaType == MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII )    return "calc_StarOffice_XML_Calc_Template";
+    else if ( aMediaType == MIMETYPE_VND_SUN_XML_CHART_ASCII )            return "chart_StarOffice_XML_Chart";
+    else if ( aMediaType == MIMETYPE_VND_SUN_XML_MATH_ASCII )             return "math_StarOffice_XML_Math";
 
     // Unknown type
     return OUString();
@@ -167,7 +167,7 @@ void SAL_CALL StorageFilterDetect::initialize(const uno::Sequence<uno::Any>& /*a
 
 OUString StorageFilterDetect_getImplementationName()
 {
-    return OUString("com.sun.star.comp.filters.StorageFilterDetect");
+    return "com.sun.star.comp.filters.StorageFilterDetect";
 }
 
 uno::Sequence<OUString> StorageFilterDetect_getSupportedServiceNames()
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 6dd61cceb439..451b94769e14 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -115,7 +115,7 @@ public:
 
     virtual OUString getClassName() const
     {
-        return OUString( "TextField" );
+        return "TextField";
     }
     virtual bool equalTo( const TextField & aTextField ) const = 0;
     virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const = 0;
@@ -152,7 +152,7 @@ public:
 
     virtual OUString getClassName() const override
     {
-        return OUString( "FixedTextField" );
+        return "FixedTextField";
     }
     virtual bool equalTo( const TextField & aTextField ) const override
     {
@@ -177,7 +177,7 @@ public:
     FixedDateTimeField() {}
     virtual OUString getClassName() const override
     {
-        return OUString( "FixedDateTimeField" );
+        return "FixedDateTimeField";
     }
     virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const override
     {
@@ -192,7 +192,7 @@ public:
     FooterField() {}
     virtual OUString getClassName() const override
     {
-        return OUString( "FooterField" );
+        return "FooterField";
     }
     virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const override
     {
@@ -207,7 +207,7 @@ class VariableTextField : public TextField
 public:
     virtual OUString getClassName() const override
     {
-        return OUString( "VariableTextField" );
+        return "VariableTextField";
     }
 };
 
@@ -223,7 +223,7 @@ public:
     }
     virtual OUString getClassName() const override
     {
-        return OUString( "VariableDateTimeField" );
+        return "VariableDateTimeField";
     }
     virtual bool equalTo( const TextField & aTextField ) const override
     {
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index 0534361dd9ad..1f8fe00c91e4 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -175,7 +175,7 @@ OUString T602ImportFilter::detect( Sequence<PropertyValue>& Descriptor)
         (aData[1] != 'C') || (aData[2] != 'T') || (aData[3] != ' '))
         return OUString();
 
-    return OUString(  "writer_T602_Document"  );
+    return "writer_T602_Document";
 }
 
 // XFilter
@@ -865,7 +865,7 @@ Sequence< OUString > SAL_CALL T602ImportFilter::getSupportedServiceNames(  )
 
 OUString T602ImportFilter_getImplementationName ()
 {
-    return OUString ( "com.sun.star.comp.Writer.T602ImportFilter" );
+    return "com.sun.star.comp.Writer.T602ImportFilter";
 }
 
 Sequence< OUString > T602ImportFilter_getSupportedServiceNames(  )
@@ -1135,7 +1135,7 @@ Sequence< OUString > SAL_CALL T602ImportFilterDialog::getSupportedServiceNames(
 
 OUString T602ImportFilterDialog_getImplementationName ()
 {
-    return OUString ( "com.sun.star.comp.Writer.T602ImportFilterDialog" );
+    return "com.sun.star.comp.Writer.T602ImportFilterDialog";
 }
 
 Sequence< OUString > T602ImportFilterDialog_getSupportedServiceNames(  )
diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx
index cb0055c34565..0551f275eecb 100644
--- a/filter/source/textfilterdetect/filterdetect.cxx
+++ b/filter/source/textfilterdetect/filterdetect.cxx
@@ -214,7 +214,7 @@ void SAL_CALL PlainTextFilterDetect::initialize(const uno::Sequence<uno::Any>& /
 
 OUString PlainTextFilterDetect_getImplementationName()
 {
-    return OUString("com.sun.star.comp.filters.PlainTextFilterDetect");
+    return "com.sun.star.comp.filters.PlainTextFilterDetect";
 }
 
 uno::Sequence<OUString> PlainTextFilterDetect_getSupportedServiceNames()
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 400a9aa66d17..20ed64a4fb30 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -348,7 +348,7 @@ void SAL_CALL XmlFilterAdaptor::initialize( const Sequence< Any >& aArguments )
 }
 OUString XmlFilterAdaptor_getImplementationName ()
 {
-    return OUString( "com.sun.star.comp.Writer.XmlFilterAdaptor" );
+    return "com.sun.star.comp.Writer.XmlFilterAdaptor";
 }
 
 Sequence< OUString > XmlFilterAdaptor_getSupportedServiceNames(  )
diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx
index 9c1d044c0964..43a3fc288f3e 100644
--- a/filter/source/xmlfilterdetect/filterdetect.cxx
+++ b/filter/source/xmlfilterdetect/filterdetect.cxx
@@ -221,7 +221,7 @@ void SAL_CALL FilterDetect::initialize( const Sequence< Any >& /*aArguments*/ )
 
 OUString FilterDetect_getImplementationName ()
 {
-    return OUString( "com.sun.star.comp.filters.XMLFilterDetect" );
+    return "com.sun.star.comp.filters.XMLFilterDetect";
 }
 
 Sequence< OUString > FilterDetect_getSupportedServiceNames()
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 730c132ffb3a..f454dfda5627 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -165,7 +165,7 @@ void SAL_CALL XMLFilterDialogComponent::release() throw ()
 /// @throws RuntimeException
 static OUString XMLFilterDialogComponent_getImplementationName()
 {
-    return OUString( "com.sun.star.comp.ui.XSLTFilterDialog" );
+    return "com.sun.star.comp.ui.XSLTFilterDialog";
 }
 
 /// @throws RuntimeException