[Libreoffice-commits] core.git: 7 commits - embeddedobj/source emfio/source eventattacher/source extensions/source filter/source forms/source formula/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Wed Jul 31 11:00:38 UTC 2019


 embeddedobj/source/commonembedding/persistence.cxx           |    2 
 embeddedobj/source/commonembedding/xfactory.cxx              |    4 
 embeddedobj/source/general/xcreator.cxx                      |    2 
 embeddedobj/source/msole/xolefactory.cxx                     |    2 
 emfio/source/emfuno/xemfparser.cxx                           |    2 
 emfio/source/reader/mtftools.cxx                             |    2 
 eventattacher/source/eventattacher.cxx                       |    2 
 extensions/source/abpilot/unodialogabp.cxx                   |    2 
 extensions/source/bibliography/bibload.cxx                   |    2 
 extensions/source/bibliography/framectr.cxx                  |    2 
 extensions/source/config/ldap/ldapuserprofilebe.cxx          |    2 
 extensions/source/dbpilots/wizardservices.cxx                |    6 -
 extensions/source/logging/consolehandler.cxx                 |    2 
 extensions/source/logging/csvformatter.cxx                   |    2 
 extensions/source/logging/filehandler.cxx                    |    2 
 extensions/source/logging/logger.cxx                         |    2 
 extensions/source/logging/plaintextformatter.cxx             |    2 
 extensions/source/logging/simpletextformatter.cxx            |    2 
 extensions/source/propctrlr/MasterDetailLinkDialog.cxx       |    2 
 extensions/source/propctrlr/buttonnavigationhandler.cxx      |    2 
 extensions/source/propctrlr/cellbindinghandler.cxx           |    2 
 extensions/source/propctrlr/controlfontdialog.cxx            |    2 
 extensions/source/propctrlr/defaultforminspection.cxx        |    2 
 extensions/source/propctrlr/defaulthelpprovider.cxx          |    2 
 extensions/source/propctrlr/editpropertyhandler.cxx          |    2 
 extensions/source/propctrlr/eformspropertyhandler.cxx        |    2 
 extensions/source/propctrlr/eventhandler.cxx                 |    2 
 extensions/source/propctrlr/formcomponenthandler.cxx         |    2 
 extensions/source/propctrlr/formcontroller.cxx               |    4 
 extensions/source/propctrlr/formgeometryhandler.cxx          |    2 
 extensions/source/propctrlr/genericpropertyhandler.cxx       |    2 
 extensions/source/propctrlr/objectinspectormodel.cxx         |    2 
 extensions/source/propctrlr/pcrunodialogs.cxx                |    2 
 extensions/source/propctrlr/propcontroller.cxx               |    2 
 extensions/source/propctrlr/stringrepresentation.cxx         |    4 
 extensions/source/propctrlr/submissionhandler.cxx            |    2 
 extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx |    2 
 extensions/source/scanner/scanner.cxx                        |    2 
 extensions/source/update/feed/updatefeed.cxx                 |    2 
 filter/source/config/cache/configflush.cxx                   |    2 
 filter/source/config/cache/contenthandlerfactory.cxx         |    2 
 filter/source/config/cache/filterfactory.cxx                 |    2 
 filter/source/config/cache/frameloaderfactory.cxx            |    2 
 filter/source/config/cache/typedetection.cxx                 |    2 
 filter/source/flash/swfdialog.cxx                            |    2 
 filter/source/flash/swffilter.cxx                            |    4 
 filter/source/graphicfilter/idxf/dxfreprd.cxx                |    2 
 filter/source/msfilter/msdffimp.cxx                          |   24 ++--
 filter/source/msfilter/msoleexp.cxx                          |   12 +-
 filter/source/msfilter/msvbahelper.cxx                       |    2 
 filter/source/msfilter/rtfutil.cxx                           |    2 
 filter/source/msfilter/svxmsbas2.cxx                         |    2 
 filter/source/odfflatxml/OdfFlatXml.cxx                      |    4 
 filter/source/pdf/pdfdialog.cxx                              |    2 
 filter/source/pdf/pdffilter.cxx                              |    2 
 filter/source/pdf/pdfinteract.cxx                            |    2 
 filter/source/storagefilterdetect/filterdetect.cxx           |   54 +++++------
 filter/source/svg/svgexport.cxx                              |   12 +-
 filter/source/t602/t602filter.cxx                            |    6 -
 filter/source/textfilterdetect/filterdetect.cxx              |    2 
 filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx          |    2 
 filter/source/xmlfilterdetect/filterdetect.cxx               |    2 
 filter/source/xsltdialog/xmlfilterdialogcomponent.cxx        |    2 
 forms/source/component/Button.cxx                            |    2 
 forms/source/component/Button.hxx                            |    4 
 forms/source/component/CheckBox.cxx                          |    2 
 forms/source/component/CheckBox.hxx                          |    4 
 forms/source/component/ComboBox.cxx                          |    2 
 forms/source/component/ComboBox.hxx                          |    4 
 forms/source/component/Currency.cxx                          |    2 
 forms/source/component/Currency.hxx                          |    4 
 forms/source/component/DatabaseForm.cxx                      |    4 
 forms/source/component/Date.cxx                              |    2 
 forms/source/component/Date.hxx                              |    4 
 forms/source/component/Edit.cxx                              |    2 
 forms/source/component/Edit.hxx                              |    4 
 forms/source/component/File.cxx                              |    2 
 forms/source/component/File.hxx                              |    2 
 forms/source/component/Filter.cxx                            |    2 
 forms/source/component/FixedText.cxx                         |    2 
 forms/source/component/FixedText.hxx                         |    2 
 forms/source/component/FormattedField.cxx                    |    2 
 forms/source/component/FormattedField.hxx                    |    4 
 forms/source/component/FormattedFieldWrapper.cxx             |    4 
 forms/source/component/FormsCollection.cxx                   |    4 
 forms/source/component/Grid.cxx                              |    2 
 forms/source/component/Grid.hxx                              |    2 
 forms/source/component/GroupBox.cxx                          |    2 
 forms/source/component/GroupBox.hxx                          |    4 
 forms/source/component/Hidden.cxx                            |    2 
 forms/source/component/Hidden.hxx                            |    2 
 forms/source/component/ImageButton.cxx                       |    2 
 forms/source/component/ImageButton.hxx                       |    4 
 forms/source/component/ImageControl.cxx                      |    2 
 forms/source/component/ImageControl.hxx                      |    4 
 forms/source/component/ListBox.cxx                           |    2 
 forms/source/component/ListBox.hxx                           |    4 
 forms/source/component/Numeric.cxx                           |    2 
 forms/source/component/Numeric.hxx                           |    4 
 forms/source/component/Pattern.cxx                           |    2 
 forms/source/component/Pattern.hxx                           |    4 
 forms/source/component/RadioButton.cxx                       |    2 
 forms/source/component/RadioButton.hxx                       |    4 
 forms/source/component/Time.cxx                              |    2 
 forms/source/component/Time.hxx                              |    4 
 forms/source/component/navigationbar.cxx                     |    4 
 forms/source/component/scrollbar.cxx                         |    4 
 forms/source/component/spinbutton.cxx                        |    4 
 forms/source/richtext/richtextcontrol.cxx                    |    2 
 forms/source/richtext/richtextmodel.cxx                      |    4 
 forms/source/runtime/formoperations.cxx                      |    2 
 forms/source/solar/component/navbarcontrol.cxx               |    2 
 forms/source/xforms/model.cxx                                |    2 
 forms/source/xforms/xforms_services.cxx                      |    2 
 formula/source/core/api/FormulaOpCodeMapperObj.cxx           |    2 
 115 files changed, 193 insertions(+), 193 deletions(-)

New commits:
commit bce25ad547cfa5539c0fa11c35f7f54c4fd75578
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:55:55 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:59:11 2019 +0200

    Improved loplugin:stringconstant (now that GCC 7 supports it): embeddedobj
    
    Change-Id: Id3d255d48a8a72f760dae3c372e0e1a97d0aa508
    Reviewed-on: https://gerrit.libreoffice.org/76681
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index b4a4de81f3c5..25c619b5b157 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -440,7 +440,7 @@ OUString OCommonEmbeddedObject::GetFilterName( sal_Int32 nVersion ) const
         if (utl::ConfigManager::IsFuzzing() && nVersion == SOFFICE_FILEFORMAT_CURRENT &&
             sDocumentServiceName == "com.sun.star.chart2.ChartDocument")
         {
-            return OUString("chart8");
+            return "chart8";
         }
         try {
             ::comphelper::MimeConfigurationHelper aHelper( m_xContext );
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx
index 856335181a98..50e926fd7867 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -47,7 +47,7 @@ uno::Sequence< OUString > OOoEmbeddedObjectFactory::impl_staticGetSupportedServi
 
 OUString OOoEmbeddedObjectFactory::impl_staticGetImplementationName()
 {
-    return OUString("com.sun.star.comp.embed.OOoEmbeddedObjectFactory");
+    return "com.sun.star.comp.embed.OOoEmbeddedObjectFactory";
 }
 
 uno::Reference< uno::XInterface > OOoEmbeddedObjectFactory::impl_staticCreateSelfInstance(
@@ -395,7 +395,7 @@ uno::Sequence< OUString > OOoSpecialEmbeddedObjectFactory::impl_staticGetSupport
 
 OUString OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName()
 {
-    return OUString("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory");
+    return "com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory";
 }
 
 uno::Reference< uno::XInterface > OOoSpecialEmbeddedObjectFactory::impl_staticCreateSelfInstance(
diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index 522cc07d7942..f825c852ade4 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -51,7 +51,7 @@ uno::Sequence< OUString > UNOEmbeddedObjectCreator::impl_staticGetSupportedServi
 
 OUString UNOEmbeddedObjectCreator::impl_staticGetImplementationName()
 {
-    return OUString("com.sun.star.comp.embed.EmbeddedObjectCreator");
+    return "com.sun.star.comp.embed.EmbeddedObjectCreator";
 }
 
 
diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx
index 9049cf024db0..553f5846807a 100644
--- a/embeddedobj/source/msole/xolefactory.cxx
+++ b/embeddedobj/source/msole/xolefactory.cxx
@@ -46,7 +46,7 @@ uno::Sequence< OUString > OleEmbeddedObjectFactory::impl_staticGetSupportedServi
 
 OUString OleEmbeddedObjectFactory::impl_staticGetImplementationName()
 {
-    return OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory");
+    return "com.sun.star.comp.embed.OLEEmbeddedObjectFactory";
 }
 
 
commit 3a9e5c09b8c8064cdf04bad6e3901aa51e9c9f20
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:55:28 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:59:07 2019 +0200

    Improved loplugin:stringconstant (now that GCC 7 supports it): emfio
    
    Change-Id: I8effe9e6e82340613016807490d1e727c02d1f6a
    Reviewed-on: https://gerrit.libreoffice.org/76680
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/emfio/source/emfuno/xemfparser.cxx b/emfio/source/emfuno/xemfparser.cxx
index d212fc58b79f..f28633a73446 100644
--- a/emfio/source/emfuno/xemfparser.cxx
+++ b/emfio/source/emfuno/xemfparser.cxx
@@ -93,7 +93,7 @@ namespace emfio
 
         OUString XEmfParser_getImplementationName()
         {
-            return OUString( "emfio::emfreader::XEmfParser" );
+            return "emfio::emfreader::XEmfParser";
         }
 
         uno::Reference< uno::XInterface > XEmfParser_createInstance(const uno::Reference< uno::XComponentContext >& context)
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index e1d46c471124..4de2dd4c1fe2 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -174,7 +174,7 @@ namespace emfio
     OUString getLODefaultLanguage()
     {
         if (utl::ConfigManager::IsFuzzing())
-            return OUString("en-US");
+            return "en-US";
         OUString result(officecfg::Office::Linguistic::General::DefaultLocale::get());
         if (result.isEmpty())
             result = officecfg::Setup::L10N::ooSetupSystemLocale::get();
commit 45adfba73e8b171e08ce3fadd4a066e04d4f0880
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:55:19 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:59:01 2019 +0200

    Improved loplugin:stringconstant (now that GCC 7 supports it): eventattacher
    
    Change-Id: I6a662840505ee7ac4a1512aabfc0f2d0779206dc
    Reviewed-on: https://gerrit.libreoffice.org/76679
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index 6880aa2e695d..2ade05a1fd25 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -288,7 +288,7 @@ static Reference< XInterface > EventAttacherImpl_CreateInstance( const Reference
 
 OUString SAL_CALL EventAttacherImpl::getImplementationName(  )
 {
-    return OUString(  IMPLNAME  );
+    return IMPLNAME;
 }
 
 sal_Bool SAL_CALL EventAttacherImpl::supportsService( const OUString& ServiceName )
commit 86731aab9dbb9e5c941ed2a9aced327848e1e5f7
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:55:06 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:58:51 2019 +0200

    Improved loplugin:stringconstant (now that GCC 7 supports it): extensions
    
    Change-Id: Ic99c822e8461ab46056be05846314bb772ef2957
    Reviewed-on: https://gerrit.libreoffice.org/76678
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index 636fb2fbe485..ded9cd8c3049 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -74,7 +74,7 @@ namespace abp
 
     OUString SAL_CALL OABSPilotUno::getImplementationName()
     {
-        return OUString("org.openoffice.comp.abp.OAddressBookSourcePilot");
+        return "org.openoffice.comp.abp.OAddressBookSourcePilot";
     }
 
     css::uno::Sequence<OUString> SAL_CALL OABSPilotUno::getSupportedServiceNames()
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 55a02482ec40..21676f75e10b 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -105,7 +105,7 @@ public:
 
                             {
                                 //!
-                                return OUString("com.sun.star.extensions.Bibliography");
+                                return "com.sun.star.extensions.Bibliography";
                                 //!
                             }
 
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 6ca93186599c..0488e15745b5 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -165,7 +165,7 @@ BibFrameController_Impl::~BibFrameController_Impl()
 
 OUString SAL_CALL BibFrameController_Impl::getImplementationName()
 {
-    return OUString("com.sun.star.comp.extensions.Bibliography");
+    return "com.sun.star.comp.extensions.Bibliography";
 }
 
 sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const OUString& sServiceName )
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx
index 9e5460b7b5fd..f1f3143417a9 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.cxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx
@@ -204,7 +204,7 @@ css::uno::Any LdapUserProfileBe::getPropertyValue(
 
 
 OUString LdapUserProfileBe::getLdapUserProfileBeName() {
-    return OUString("com.sun.star.comp.configuration.backend.LdapUserProfileBe");
+    return "com.sun.star.comp.configuration.backend.LdapUserProfileBe";
 }
 
 
diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx
index 09a2b7e2ee78..2f7b91b45a36 100644
--- a/extensions/source/dbpilots/wizardservices.cxx
+++ b/extensions/source/dbpilots/wizardservices.cxx
@@ -57,7 +57,7 @@ namespace dbp
 
     OUString OGroupBoxSI::getImplementationName()
     {
-        return OUString("org.openoffice.comp.dbp.OGroupBoxWizard");
+        return "org.openoffice.comp.dbp.OGroupBoxWizard";
     }
 
 
@@ -69,7 +69,7 @@ namespace dbp
 
     OUString OListComboSI::getImplementationName()
     {
-        return OUString("org.openoffice.comp.dbp.OListComboWizard");
+        return "org.openoffice.comp.dbp.OListComboWizard";
     }
 
 
@@ -81,7 +81,7 @@ namespace dbp
 
     OUString OGridSI::getImplementationName()
     {
-        return OUString("org.openoffice.comp.dbp.OGridWizard");
+        return "org.openoffice.comp.dbp.OGridWizard";
     }
 
 
diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx
index 346880936e3f..a241126cc7d6 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -233,7 +233,7 @@ namespace logging
 
     OUString SAL_CALL ConsoleHandler::getImplementationName()
     {
-        return OUString("com.sun.star.comp.extensions.ConsoleHandler");
+        return "com.sun.star.comp.extensions.ConsoleHandler";
     }
 
     sal_Bool SAL_CALL ConsoleHandler::supportsService( const OUString& _rServiceName )
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index 80395cb4023b..bce6922dcb62 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -300,7 +300,7 @@ namespace logging
 
     OUString SAL_CALL CsvFormatter::getImplementationName()
     {
-        return OUString("com.sun.star.comp.extensions.CsvFormatter");
+        return "com.sun.star.comp.extensions.CsvFormatter";
     }
 
     Sequence< OUString > SAL_CALL CsvFormatter::getSupportedServiceNames()
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index 3aa0927ce54d..bec33521418c 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -332,7 +332,7 @@ namespace logging
 
     OUString SAL_CALL FileHandler::getImplementationName()
     {
-        return OUString("com.sun.star.comp.extensions.FileHandler");
+        return "com.sun.star.comp.extensions.FileHandler";
     }
 
     sal_Bool SAL_CALL FileHandler::supportsService( const OUString& _rServiceName )
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index 32f60a70d315..43dbe1a3a2a2 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -215,7 +215,7 @@ namespace logging
 
     OUString SAL_CALL LoggerPool::getImplementationName()
     {
-        return OUString("com.sun.star.comp.extensions.LoggerPool");
+        return "com.sun.star.comp.extensions.LoggerPool";
     }
 
     sal_Bool SAL_CALL LoggerPool::supportsService( const OUString& _rServiceName )
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index 3a3d0fce686d..a4ac9c35000c 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -129,7 +129,7 @@ namespace logging
 
     OUString SAL_CALL PlainTextFormatter::getImplementationName()
     {
-        return OUString("com.sun.star.comp.extensions.PlainTextFormatter");
+        return "com.sun.star.comp.extensions.PlainTextFormatter";
     }
 
     Sequence< OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames()
diff --git a/extensions/source/logging/simpletextformatter.cxx b/extensions/source/logging/simpletextformatter.cxx
index a5eb3deaf547..003c978233b1 100644
--- a/extensions/source/logging/simpletextformatter.cxx
+++ b/extensions/source/logging/simpletextformatter.cxx
@@ -83,7 +83,7 @@ sal_Bool SAL_CALL SimpleTextFormatter::supportsService(const OUString& _rService
 
 OUString SAL_CALL SimpleTextFormatter::getImplementationName()
 {
-    return OUString("com.sun.star.comp.extensions.SimpleTextFormatter");
+    return "com.sun.star.comp.extensions.SimpleTextFormatter";
 }
 
 Sequence<OUString> SAL_CALL SimpleTextFormatter::getSupportedServiceNames()
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
index 4df51cddcd39..b69d6d540509 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
@@ -63,7 +63,7 @@ namespace pcr
 
     OUString MasterDetailLinkDialog::getImplementationName_static()
     {
-        return OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog");
+        return "org.openoffice.comp.form.ui.MasterDetailLinkDialog";
     }
 
 
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx
index 5488d9b5428b..5313fafec170 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.cxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx
@@ -57,7 +57,7 @@ namespace pcr
 
     OUString ButtonNavigationHandler::getImplementationName_static(  )
     {
-        return OUString( "com.sun.star.comp.extensions.ButtonNavigationHandler" );
+        return "com.sun.star.comp.extensions.ButtonNavigationHandler";
     }
 
 
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index 3a9bda45a9c6..5db199db94ef 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -59,7 +59,7 @@ namespace pcr
 
     OUString CellBindingPropertyHandler::getImplementationName_static(  )
     {
-        return OUString( "com.sun.star.comp.extensions.CellBindingPropertyHandler" );
+        return "com.sun.star.comp.extensions.CellBindingPropertyHandler";
     }
 
 
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index 01238a5af478..5b34d7a76008 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -87,7 +87,7 @@ namespace pcr
 
     OUString OControlFontDialog::getImplementationName_static()
     {
-        return OUString("org.openoffice.comp.form.ui.OControlFontDialog");
+        return "org.openoffice.comp.form.ui.OControlFontDialog";
     }
 
 
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index e139745d79d8..9d19aef5fc56 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -78,7 +78,7 @@ namespace pcr
 
     OUString DefaultFormComponentInspectorModel::getImplementationName_static(  )
     {
-        return OUString("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel");
+        return "org.openoffice.comp.extensions.DefaultFormComponentInspectorModel";
     }
 
 
diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx
index 4f4a4b0b9cbf..322a04f8926c 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.cxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.cxx
@@ -69,7 +69,7 @@ namespace pcr
 
     OUString DefaultHelpProvider::getImplementationName_static(  )
     {
-        return OUString("org.openoffice.comp.extensions.DefaultHelpProvider");
+        return "org.openoffice.comp.extensions.DefaultHelpProvider";
     }
 
 
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index a1016e2075cd..f60edd92e0af 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -64,7 +64,7 @@ namespace pcr
 
     OUString EditPropertyHandler::getImplementationName_static(  )
     {
-        return OUString( "com.sun.star.comp.extensions.EditPropertyHandler" );
+        return "com.sun.star.comp.extensions.EditPropertyHandler";
     }
 
 
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index d85474156463..5bf819e099f2 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -75,7 +75,7 @@ namespace pcr
 
     OUString EFormsPropertyHandler::getImplementationName_static(  )
     {
-        return OUString( "com.sun.star.comp.extensions.EFormsPropertyHandler" );
+        return "com.sun.star.comp.extensions.EFormsPropertyHandler";
     }
 
 
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 9d414a4be13a..d53cdba2172c 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -463,7 +463,7 @@ namespace pcr
 
     OUString EventHandler::getImplementationName_static(  )
     {
-        return OUString(  "com.sun.star.comp.extensions.EventHandler"  );
+        return "com.sun.star.comp.extensions.EventHandler";
     }
 
     Sequence< OUString > EventHandler::getSupportedServiceNames_static(  )
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index ed7348bfaa5d..93464c0f2669 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -164,7 +164,7 @@ namespace pcr
 
     OUString FormComponentPropertyHandler::getImplementationName_static(  )
     {
-        return OUString(  "com.sun.star.comp.extensions.FormComponentPropertyHandler"  );
+        return "com.sun.star.comp.extensions.FormComponentPropertyHandler";
     }
 
 
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index 3c85a0ac4190..5ac5f7fed1fb 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -121,7 +121,7 @@ namespace pcr
 
     OUString FormController::getImplementationName_static(  )
     {
-        return OUString("org.openoffice.comp.extensions.FormController");
+        return "org.openoffice.comp.extensions.FormController";
     }
 
 
@@ -248,7 +248,7 @@ namespace pcr
 
     OUString DialogController::getImplementationName_static(  )
     {
-        return OUString("org.openoffice.comp.extensions.DialogController");
+        return "org.openoffice.comp.extensions.DialogController";
     }
 
 
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index d97301c743ab..28c5aa03901a 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -310,7 +310,7 @@ namespace pcr
 
     OUString FormGeometryHandler::getImplementationName_static(  )
     {
-        return OUString( "com.sun.star.comp.extensions.FormGeometryHandler" );
+        return "com.sun.star.comp.extensions.FormGeometryHandler";
     }
 
 
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 267ab9bc6c78..20e668c569a3 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -283,7 +283,7 @@ namespace pcr
 
     OUString GenericPropertyHandler::getImplementationName_static(  )
     {
-        return OUString( "com.sun.star.comp.extensions.GenericPropertyHandler" );
+        return "com.sun.star.comp.extensions.GenericPropertyHandler";
     }
 
     Sequence< OUString > GenericPropertyHandler::getSupportedServiceNames_static(  )
diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx
index 794a6561298f..aa0628555e59 100644
--- a/extensions/source/propctrlr/objectinspectormodel.cxx
+++ b/extensions/source/propctrlr/objectinspectormodel.cxx
@@ -159,7 +159,7 @@ namespace pcr
 
     OUString ObjectInspectorModel::getImplementationName_static(  )
     {
-        return OUString( "org.openoffice.comp.extensions.ObjectInspectorModel" );
+        return "org.openoffice.comp.extensions.ObjectInspectorModel";
     }
 
 
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index fb11a982401b..e072caa70b47 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -91,7 +91,7 @@ namespace pcr
 
     OUString OTabOrderDialog::getImplementationName_static()
     {
-        return OUString("org.openoffice.comp.form.ui.OTabOrderDialog");
+        return "org.openoffice.comp.form.ui.OTabOrderDialog";
     }
 
 
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 50cd32f0d12b..1b789bf86764 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -550,7 +550,7 @@ namespace pcr
 
     OUString OPropertyBrowserController::getImplementationName_static(  )
     {
-        return OUString("org.openoffice.comp.extensions.ObjectInspector");
+        return "org.openoffice.comp.extensions.ObjectInspector";
     }
 
 
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index 3d2fc67e0efb..42d638c2f9e5 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -613,8 +613,8 @@ bool StringRepresentation::convertStringToGenericValue( const OUString& _rString
 namespace comp_StringRepresentation {
 
 OUString _getImplementationName() {
-    return OUString(
-        "StringRepresentation");
+    return
+        "StringRepresentation";
 }
 
 uno::Sequence< OUString > _getSupportedServiceNames()
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index 63a9e5a98e35..921008c42091 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -106,7 +106,7 @@ namespace pcr
 
     OUString SubmissionPropertyHandler::getImplementationName_static(  )
     {
-        return OUString( "com.sun.star.comp.extensions.SubmissionPropertyHandler" );
+        return "com.sun.star.comp.extensions.SubmissionPropertyHandler";
     }
 
 
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index fb99949ca40d..0ead90425b61 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -87,7 +87,7 @@ namespace pcr
 
     OUString XSDValidationPropertyHandler::getImplementationName_static(  )
     {
-        return OUString( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" );
+        return "com.sun.star.comp.extensions.XSDValidationPropertyHandler";
     }
 
 
diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx
index d51fca0b1ef9..ae0bd96893c8 100644
--- a/extensions/source/scanner/scanner.cxx
+++ b/extensions/source/scanner/scanner.cxx
@@ -67,7 +67,7 @@ css::uno::Sequence<OUString> ScannerManager::getSupportedServiceNames()
 
 OUString ScannerManager::getImplementationName_Static() throw()
 {
-    return OUString( "com.sun.star.scanner.ScannerManager" );
+    return "com.sun.star.scanner.ScannerManager";
 }
 
 
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 6998da2f941b..e49fb29c4c54 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -756,7 +756,7 @@ UpdateInformationProvider::getServiceNames()
 OUString
 UpdateInformationProvider::getImplName()
 {
-    return OUString("vnd.sun.UpdateInformationProvider");
+    return "vnd.sun.UpdateInformationProvider";
 }
 
 
commit 5f28debd416e83736a76d98b229050b6d2ec8226
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:54:59 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:58:46 2019 +0200

    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 at redhat.com>

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
commit f018d6274ddd6992c863f091b2f1632e52197267
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:54:50 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:58:39 2019 +0200

    Improved loplugin:stringconstant (now that GCC 7 supports it): forms
    
    Change-Id: I105fc954a983280ec07759a7f9d21e726a970a80
    Reviewed-on: https://gerrit.libreoffice.org/76676
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 68c7d153fbbc..31f87284d0d4 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -129,7 +129,7 @@ css::uno::Sequence<OUString>  OButtonModel::getSupportedServiceNames()
 
 OUString OButtonModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_COMMANDBUTTON); // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_COMMANDBUTTON; // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx
index cd3907742686..341ea2dc2c00 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -56,7 +56,7 @@ public:
 
 // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OButtonModel"); }
+    { return "com.sun.star.form.OButtonModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -132,7 +132,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OButtonControl"); }
+    { return "com.sun.star.form.OButtonControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx
index a62e6dce38eb..1966a53fab06 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -117,7 +117,7 @@ void OCheckBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) co
 
 OUString SAL_CALL OCheckBoxModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_CHECKBOX);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_CHECKBOX;  // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx
index 8b13a018afcb..ea2e633a28ca 100644
--- a/forms/source/component/CheckBox.hxx
+++ b/forms/source/component/CheckBox.hxx
@@ -35,7 +35,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OCheckBoxModel"); }
+    { return "com.sun.star.form.OCheckBoxModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -66,7 +66,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OCheckBoxControl"); }
+    { return "com.sun.star.form.OCheckBoxControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 03d46288a6bf..62a0b54b1e14 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -326,7 +326,7 @@ void OComboBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg
 
 OUString SAL_CALL OComboBoxModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_COMBOBOX);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_COMBOBOX;  // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index dd5db15a010e..408b5b64e54f 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -78,7 +78,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OComboBoxModel"); }
+    { return "com.sun.star.form.OComboBoxModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -135,7 +135,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OComboBoxControl"); }
+    { return "com.sun.star.form.OComboBoxControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index a64cd35287cb..57f712b72f05 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -167,7 +167,7 @@ void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) co
 
 OUString SAL_CALL OCurrencyModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_CURRENCYFIELD); // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_CURRENCYFIELD; // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx
index df7b36328298..a0113fd1372e 100644
--- a/forms/source/component/Currency.hxx
+++ b/forms/source/component/Currency.hxx
@@ -36,7 +36,7 @@ public:
 
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OCurrencyModel"); }
+    { return "com.sun.star.form.OCurrencyModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -68,7 +68,7 @@ public:
     explicit OCurrencyControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OCurrencyControl"); }
+    { return "com.sun.star.form.OCurrencyControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index ca2c07496fc1..a24e9eee91da 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -3696,7 +3696,7 @@ void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt )
 
 OUString SAL_CALL ODatabaseForm::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.forms.ODatabaseForm" );
+    return "com.sun.star.comp.forms.ODatabaseForm";
 }
 
 
@@ -3729,7 +3729,7 @@ const sal_uInt16 DONTAPPLYFILTER    = 0x0002;
 
 OUString ODatabaseForm::getServiceName()
 {
-    return OUString(FRM_COMPONENT_FORM);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_FORM;  // old (non-sun) name for compatibility !
 }
 
 void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutStream)
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 99d76d259495..fc6bc5ebfce7 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -146,7 +146,7 @@ css::uno::Sequence<OUString> SAL_CALL ODateModel::getSupportedServiceNames()
 
 OUString SAL_CALL ODateModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_DATEFIELD); // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_DATEFIELD; // old (non-sun) name for compatibility !
 }
 
 // XPropertySet
diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx
index 1074ff25a732..44ed97320ad5 100644
--- a/forms/source/component/Date.hxx
+++ b/forms/source/component/Date.hxx
@@ -51,7 +51,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.ODateModel"); }
+    { return "com.sun.star.form.ODateModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -98,7 +98,7 @@ public:
 
 // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.ODateControl"); }
+    { return "com.sun.star.form.ODateControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index c5f82e7fc30a..3573224206b1 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -304,7 +304,7 @@ void OEditModel::disposing()
 
 OUString SAL_CALL OEditModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_EDIT);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_EDIT;  // old (non-sun) name for compatibility !
 }
 
 // XServiceInfo
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index af552528333c..755ae41bc1c5 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -70,7 +70,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OEditModel"); }
+    { return "com.sun.star.form.OEditModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -141,7 +141,7 @@ public:
 
 // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OEditControl"); }
+    { return "com.sun.star.form.OEditControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index b2fc1da00430..d8ac1a80ecbf 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -177,7 +177,7 @@ void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps )
 
 OUString SAL_CALL OFileControlModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_FILECONTROL);   // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_FILECONTROL;   // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx
index a20eb945d2ab..651d830ace92 100644
--- a/forms/source/component/File.hxx
+++ b/forms/source/component/File.hxx
@@ -44,7 +44,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OFileControlModel"); }
+    { return "com.sun.star.form.OFileControlModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index ccaa7f209687..8bc457ec3e93 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -874,7 +874,7 @@ namespace frm
 
     OUString SAL_CALL OFilterControl::getImplementationName(  )
     {
-        return OUString( "com.sun.star.comp.forms.OFilterControl" );
+        return "com.sun.star.comp.forms.OFilterControl";
     }
 
     sal_Bool SAL_CALL OFilterControl::supportsService( const OUString& ServiceName )
diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx
index 34e74d094d70..0dcf18a7629c 100644
--- a/forms/source/component/FixedText.cxx
+++ b/forms/source/component/FixedText.cxx
@@ -83,7 +83,7 @@ void OFixedTextModel::describeAggregateProperties( Sequence< Property >& _rAggre
 
 OUString SAL_CALL OFixedTextModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_FIXEDTEXT); // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_FIXEDTEXT; // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx
index 262aafb66768..58c2a8a07092 100644
--- a/forms/source/component/FixedText.hxx
+++ b/forms/source/component/FixedText.hxx
@@ -34,7 +34,7 @@ public:
 
 // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OFixedTextModel"); }
+    { return "com.sun.star.form.OFixedTextModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 0e5d7f157d56..178cf037312d 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -335,7 +335,7 @@ Sequence< Type > OFormattedModel::_getTypes()
 // XPersistObject
 OUString SAL_CALL OFormattedModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_EDIT);
+    return FRM_COMPONENT_EDIT;
 }
 
 // XPropertySet
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index 8d3f3d16c917..d0f1394f59be 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -67,7 +67,7 @@ class OFormattedModel final
 
         // XServiceInfo
         OUString SAL_CALL getImplementationName() override
-        { return OUString("com.sun.star.form.OFormattedModel"); }
+        { return "com.sun.star.form.OFormattedModel"; }
 
         virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -148,7 +148,7 @@ class OFormattedModel final
 
         // css::lang::XServiceInfo
         OUString SAL_CALL getImplementationName() override
-        { return OUString("com.sun.star.form.OFormattedControl"); }
+        { return "com.sun.star.form.OFormattedControl"; }
 
         virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index beebbac8a78f..1a7cf9446190 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -173,12 +173,12 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType)
 OUString SAL_CALL OFormattedFieldWrapper::getServiceName()
 {
     // return the old compatibility name for an EditModel
-    return OUString(FRM_COMPONENT_EDIT);
+    return FRM_COMPONENT_EDIT;
 }
 
 OUString SAL_CALL OFormattedFieldWrapper::getImplementationName(  )
 {
-    return OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted");
+    return "com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted";
 }
 
 sal_Bool SAL_CALL OFormattedFieldWrapper::supportsService( const OUString& _rServiceName )
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index 841bc493e8a7..753deca90143 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star::util;
 
 OUString SAL_CALL OFormsCollection::getServiceName()
 {
-    return OUString("com.sun.star.form.Forms");
+    return "com.sun.star.form.Forms";
 }
 
 Sequence< sal_Int8 > SAL_CALL OFormsCollection::getImplementationId(  )
@@ -85,7 +85,7 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType)
 
 OUString SAL_CALL OFormsCollection::getImplementationName()
 {
-    return OUString("com.sun.star.form.OFormsCollection");
+    return "com.sun.star.form.OFormsCollection";
 }
 
 sal_Bool SAL_CALL OFormsCollection::supportsService( const OUString& _rServiceName )
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 80294635082f..33ed91ec739e 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -754,7 +754,7 @@ void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxO
 // XPersistObject
 OUString SAL_CALL OGridControlModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_GRID);  // old (non-sun) name for compatibility!
+    return FRM_COMPONENT_GRID;  // old (non-sun) name for compatibility!
 }
 
 void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index 6afaeb171472..ae63722286d8 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -100,7 +100,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OGridControlModel"); }
+    { return "com.sun.star.form.OGridControlModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index 510b993e5fe9..8e620e3bafc7 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -86,7 +86,7 @@ void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg
 
 OUString SAL_CALL OGroupBoxModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_GROUPBOX);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_GROUPBOX;  // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx
index 2e2233798e90..f761b77ab7bc 100644
--- a/forms/source/component/GroupBox.hxx
+++ b/forms/source/component/GroupBox.hxx
@@ -34,7 +34,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OGroupBoxModel"); }
+    { return "com.sun.star.form.OGroupBoxModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -64,7 +64,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OGroupBoxControl"); }
+    { return "com.sun.star.form.OGroupBoxControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index d127e30cc5ff..ba73b5c120bc 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -126,7 +126,7 @@ css::uno::Sequence<OUString> SAL_CALL OHiddenModel::getSupportedServiceNames()
 
 OUString SAL_CALL OHiddenModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_HIDDEN);    // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_HIDDEN;    // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx
index 8eec7498835e..7ff7d860f917 100644
--- a/forms/source/component/Hidden.hxx
+++ b/forms/source/component/Hidden.hxx
@@ -42,7 +42,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OHiddenModel"); }
+    { return "com.sun.star.form.OHiddenModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index d0b62fb4017f..63c627c93fe0 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -84,7 +84,7 @@ void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps )
 
 OUString OImageButtonModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_IMAGEBUTTON);   // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_IMAGEBUTTON;   // old (non-sun) name for compatibility !
 }
 
 void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx
index 37d2ef3cb608..8f618c47c13c 100644
--- a/forms/source/component/ImageButton.hxx
+++ b/forms/source/component/ImageButton.hxx
@@ -35,7 +35,7 @@ public:
 
 // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OImageButtonModel"); }
+    { return "com.sun.star.form.OImageButtonModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -66,7 +66,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OImageButtonControl"); }
+    { return "com.sun.star.form.OImageButtonControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 37b2eda2cb07..7f5d323fe691 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -339,7 +339,7 @@ void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [
 
 OUString OImageControlModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_IMAGECONTROL);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_IMAGECONTROL;  // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index df6914825e47..01ae8018a24f 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -71,7 +71,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OImageControlModel"); }
+    { return "com.sun.star.form.OImageControlModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -156,7 +156,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OImageControlControl"); }
+    { return "com.sun.star.form.OImageControlControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 9fd4406e7ded..c6abd1b8c882 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -548,7 +548,7 @@ namespace frm
 
     OUString SAL_CALL OListBoxModel::getServiceName()
     {
-        return OUString(FRM_COMPONENT_LISTBOX);   // old (non-sun) name for compatibility !
+        return FRM_COMPONENT_LISTBOX;   // old (non-sun) name for compatibility !
     }
 
 
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 42a41d522444..bd9d7aac6c43 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -128,7 +128,7 @@ public:
 
 // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OListBoxModel"); }
+    { return "com.sun.star.form.OListBoxModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -267,7 +267,7 @@ public:
 
 // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OListBoxControl"); }
+    { return "com.sun.star.form.OListBoxControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx
index 73a8e2980df4..3aa5f14343f5 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -117,7 +117,7 @@ void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) con
 
 OUString SAL_CALL ONumericModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_NUMERICFIELD);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_NUMERICFIELD;  // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx
index 2175b5beb55c..6278b3e3b76c 100644
--- a/forms/source/component/Numeric.hxx
+++ b/forms/source/component/Numeric.hxx
@@ -37,7 +37,7 @@ public:
 
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.ONumericModel"); }
+    { return "com.sun.star.form.ONumericModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -70,7 +70,7 @@ public:
 
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.ONumericControl"); }
+    { return "com.sun.star.form.ONumericControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx
index d0567ab1953e..739b93b8d213 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -106,7 +106,7 @@ void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) con
 
 OUString SAL_CALL OPatternModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_PATTERNFIELD);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_PATTERNFIELD;  // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx
index d1405f481909..80ce81639255 100644
--- a/forms/source/component/Pattern.hxx
+++ b/forms/source/component/Pattern.hxx
@@ -43,7 +43,7 @@ public:
 
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OPatternModel"); }
+    { return "com.sun.star.form.OPatternModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -76,7 +76,7 @@ public:
 
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OPatternControl"); }
+    { return "com.sun.star.form.OPatternControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index 5505ee92ea85..0983da167967 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -247,7 +247,7 @@ void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps )
 
 OUString SAL_CALL ORadioButtonModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_RADIOBUTTON);   // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_RADIOBUTTON;   // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx
index be671f616b48..ab4e996a8600 100644
--- a/forms/source/component/RadioButton.hxx
+++ b/forms/source/component/RadioButton.hxx
@@ -33,7 +33,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.ORadioButtonModel"); }
+    { return "com.sun.star.form.ORadioButtonModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -75,7 +75,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.ORadioButtonControl"); }
+    { return "com.sun.star.form.ORadioButtonControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index ae993b98584c..85ccbaaf425b 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -138,7 +138,7 @@ IMPLEMENT_DEFAULT_CLONING( OTimeModel )
 
 OUString SAL_CALL OTimeModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_TIMEFIELD); // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_TIMEFIELD; // old (non-sun) name for compatibility !
 }
 
 // XPropertySet
diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx
index 81c5b47c04be..cc9ef1136042 100644
--- a/forms/source/component/Time.hxx
+++ b/forms/source/component/Time.hxx
@@ -52,7 +52,7 @@ public:
 
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OTimeModel"); }
+    { return "com.sun.star.form.OTimeModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -97,7 +97,7 @@ public:
 
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OTimeControl"); }
+    { return "com.sun.star.form.OTimeControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index abc09ef73826..36893eaf1624 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -144,7 +144,7 @@ namespace frm
 
     OUString SAL_CALL ONavigationBarModel::getImplementationName()
     {
-        return OUString( "com.sun.star.comp.form.ONavigationBarModel" );
+        return "com.sun.star.comp.form.ONavigationBarModel";
     }
 
 
@@ -161,7 +161,7 @@ namespace frm
 
     OUString SAL_CALL ONavigationBarModel::getServiceName()
     {
-        return OUString(FRM_SUN_COMPONENT_NAVTOOLBAR);
+        return FRM_SUN_COMPONENT_NAVTOOLBAR;
     }
 
     #define PERSIST_TABSTOP         0x0001
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 7878c161e7e4..2e153c3d71f3 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -109,7 +109,7 @@ namespace frm
 
     OUString SAL_CALL OScrollBarModel::getImplementationName()
     {
-        return OUString( "com.sun.star.comp.forms.OScrollBarModel" );
+        return "com.sun.star.comp.forms.OScrollBarModel";
     }
 
         // note that we're passing OControlModel as "base class". This is because
@@ -231,7 +231,7 @@ namespace frm
 
     OUString SAL_CALL OScrollBarModel::getServiceName()
     {
-        return OUString(FRM_SUN_COMPONENT_SCROLLBAR);
+        return FRM_SUN_COMPONENT_SCROLLBAR;
     }
 
 
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index e7699bfbb83c..9d6b618c3506 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -62,7 +62,7 @@ namespace frm
 
     OUString SAL_CALL OSpinButtonModel::getImplementationName()
     {
-        return OUString( "com.sun.star.comp.forms.OSpinButtonModel" );
+        return "com.sun.star.comp.forms.OSpinButtonModel";
     }
 
         // note that we're passing OControlModel as "base class". This is because
@@ -185,7 +185,7 @@ namespace frm
 
     OUString SAL_CALL OSpinButtonModel::getServiceName()
     {
-        return OUString(FRM_SUN_COMPONENT_SPINBUTTON);
+        return FRM_SUN_COMPONENT_SPINBUTTON;
     }
 
 
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 5b8158fba565..7e1b9bebcfd9 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -215,7 +215,7 @@ namespace frm
 
     OUString SAL_CALL ORichTextControl::getImplementationName()
     {
-        return OUString( "com.sun.star.comp.form.ORichTextControl" );
+        return "com.sun.star.comp.form.ORichTextControl";
     }
 
     Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames()
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 7d0ff09eeed8..3d1e7a75e834 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -228,7 +228,7 @@ namespace frm
 
     OUString SAL_CALL ORichTextModel::getImplementationName()
     {
-        return OUString( "com.sun.star.comp.forms.ORichTextModel" );
+        return "com.sun.star.comp.forms.ORichTextModel";
     }
 
     Sequence< OUString > SAL_CALL ORichTextModel::getSupportedServiceNames()
@@ -497,7 +497,7 @@ namespace frm
 
     OUString SAL_CALL ORichTextModel::getServiceName()
     {
-        return OUString(FRM_SUN_COMPONENT_RICHTEXTCONTROL);
+        return FRM_SUN_COMPONENT_RICHTEXTCONTROL;
     }
 
 
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index eb4133ee5493..e8a6463a8f48 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -158,7 +158,7 @@ namespace frm
 
     OUString SAL_CALL FormOperations::getImplementationName(  )
     {
-        return OUString( "com.sun.star.comp.forms.FormOperations" );
+        return "com.sun.star.comp.forms.FormOperations";
     }
 
     sal_Bool SAL_CALL FormOperations::supportsService( const OUString& ServiceName )
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index f9f6fdbd8adb..680f3b84e312 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -162,7 +162,7 @@ namespace frm
 
     OUString SAL_CALL ONavigationBarControl::getImplementationName()
     {
-        return OUString( "com.sun.star.comp.form.ONavigationBarControl" );
+        return "com.sun.star.comp.form.ONavigationBarControl";
     }
 
 
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 0b5b4cbd245f..433bbb89581b 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -600,7 +600,7 @@ Sequence<sal_Int8> Model::getImplementationId()
 
 OUString Model::getImplementationName()
 {
-    return OUString("com.sun.star.form.Model");
+    return "com.sun.star.form.Model";
 }
 
 sal_Bool Model::supportsService(OUString const & ServiceName)
diff --git a/forms/source/xforms/xforms_services.cxx b/forms/source/xforms/xforms_services.cxx
index b6f39fe5ae69..0550273bb7e7 100644
--- a/forms/source/xforms/xforms_services.cxx
+++ b/forms/source/xforms/xforms_services.cxx
@@ -36,7 +36,7 @@ class Implementation:
         css::lang::XServiceInfo>
 {
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.XForms"); }
+    { return "com.sun.star.form.XForms"; }
 
     sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
commit 27dcfba1009085b759f4f578b56a464340c80a0c
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:54:45 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:58:32 2019 +0200

    Improved loplugin:stringconstant (now that GCC 7 supports it): formula
    
    Change-Id: Ifbe74d3d1d08f150844de33201f60059d62e5e4b
    Reviewed-on: https://gerrit.libreoffice.org/76675
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index 57ba594e13e8..a22a1ff3d43d 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -87,7 +87,7 @@ OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName(  )
 
 OUString FormulaOpCodeMapperObj::getImplementationName_Static()
 {
-    return OUString( "simple.formula.FormulaOpCodeMapperObj" );
+    return "simple.formula.FormulaOpCodeMapperObj";
 }
 
 uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames(  )


More information about the Libreoffice-commits mailing list