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

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

20 files changed, 31 insertions, 31 deletions

diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx
index 5c197bf92eaf..ccca8d4be667 100644
--- a/sfx2/source/appl/appdispatchprovider.cxx
+++ b/sfx2/source/appl/appdispatchprovider.cxx
@@ -102,7 +102,7 @@ void SfxAppDispatchProvider::initialize(
 
 OUString SAL_CALL SfxAppDispatchProvider::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.sfx2.AppDispatchProvider" );
+    return "com.sun.star.comp.sfx2.AppDispatchProvider";
 }
 
 sal_Bool SAL_CALL SfxAppDispatchProvider::supportsService( const OUString& sServiceName )
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 89e1ea98d197..b96fe74dd544 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -121,7 +121,7 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a
 
 OUString SAL_CALL SfxTerminateListener_Impl::getImplementationName()
 {
-    return OUString("com.sun.star.comp.sfx2.SfxTerminateListener");
+    return "com.sun.star.comp.sfx2.SfxTerminateListener";
 }
 
 sal_Bool SAL_CALL SfxTerminateListener_Impl::supportsService( const OUString& sServiceName )
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index a6f66d604c1c..fc9c5b08fc52 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -159,22 +159,22 @@ namespace
         switch ( eApp )
         {
             case vcl::EnumContext::Application::Writer:
-                return OUString( "Writer" );
+                return "Writer";
                 break;
             case vcl::EnumContext::Application::Calc:
-                return OUString( "Calc" );
+                return "Calc";
                 break;
             case vcl::EnumContext::Application::Impress:
-                return OUString( "Impress" );
+                return "Impress";
                 break;
             case vcl::EnumContext::Application::Draw:
-                return OUString( "Draw" );
+                return "Draw";
                 break;
             case vcl::EnumContext::Application::Formula:
-                return OUString( "Formula" );
+                return "Formula";
                 break;
             case vcl::EnumContext::Application::Base:
-                return OUString( "Base" );
+                return "Base";
                 break;
             default:
                 return OUString();
diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx
index 1aeff343e275..98e036e0a7ea 100644
--- a/sfx2/source/appl/macroloader.cxx
+++ b/sfx2/source/appl/macroloader.cxx
@@ -62,7 +62,7 @@ SfxMacroLoader::SfxMacroLoader(const css::uno::Sequence< css::uno::Any >& aArgum
 
 OUString SAL_CALL SfxMacroLoader::getImplementationName()
 {
-    return OUString("com.sun.star.comp.sfx2.SfxMacroLoader");
+    return "com.sun.star.comp.sfx2.SfxMacroLoader";
 }
 
 sal_Bool SAL_CALL SfxMacroLoader::supportsService(OUString const & ServiceName)
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 6d828ed11343..5d4e46e40caa 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -100,7 +100,7 @@ void SAL_CALL SfxNotificationListener_Impl::disposing( const EventObject& )
 
 OUString SAL_CALL ShutdownIcon::getImplementationName()
 {
-    return OUString("com.sun.star.comp.desktop.QuickstartWrapper");
+    return "com.sun.star.comp.desktop.QuickstartWrapper";
 }
 
 sal_Bool SAL_CALL ShutdownIcon::supportsService(OUString const & ServiceName)
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 0e0c559476bf..2434cabbef7c 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -148,7 +148,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolde
 
 OUString SAL_CALL OPackageStructureCreator::getImplementationName()
 {
-    return OUString("com.sun.star.comp.embed.PackageStructureCreator");
+    return "com.sun.star.comp.embed.PackageStructureCreator";
 }
 
 sal_Bool SAL_CALL OPackageStructureCreator::supportsService( const OUString& ServiceName )
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index 2565c6614877..91b31ebc8a92 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -195,7 +195,7 @@ sal_Int16 SAL_CALL ThumbnailViewAcc::getAccessibleRole()
 OUString SAL_CALL ThumbnailViewAcc::getAccessibleDescription()
 {
     ThrowIfDisposed();
-    return OUString("ThumbnailView");
+    return "ThumbnailView";
 }
 
 OUString SAL_CALL ThumbnailViewAcc::getAccessibleName()
@@ -652,7 +652,7 @@ sal_Int16 SAL_CALL SfxThumbnailViewAcc::getAccessibleRole()
 OUString SAL_CALL SfxThumbnailViewAcc::getAccessibleDescription()
 {
     ThrowIfDisposed();
-    return OUString("ThumbnailView");
+    return "ThumbnailView";
 }
 
 OUString SAL_CALL SfxThumbnailViewAcc::getAccessibleName()
diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx
index 22df8b24937a..2e36f8f18887 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -271,7 +271,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL BackingComp::getImplementationId()
 
 OUString SAL_CALL BackingComp::getImplementationName()
 {
-    return OUString("com.sun.star.comp.sfx2.BackingComp");
+    return "com.sun.star.comp.sfx2.BackingComp";
 }
 
 sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const OUString& sServiceName )
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index a59d7c8159c6..62d58ceee285 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -395,7 +395,7 @@ namespace sfx2
 
     static OUString getSeparatorString()
     {
-        return OUString(";");
+        return ";";
     }
 
 
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index a9d248a2738c..ad5417688fdc 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -326,7 +326,7 @@ public:
 // XServiceInfo
     virtual OUString SAL_CALL getImplementationName(  ) override
     {
-        return OUString("CompatWriterDocPropsImpl");
+        return "CompatWriterDocPropsImpl";
     }
 
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override
@@ -1264,7 +1264,7 @@ SfxDocumentMetaData::SfxDocumentMetaData(
 OUString SAL_CALL
 SfxDocumentMetaData::getImplementationName()
 {
-    return OUString("SfxDocumentMetaData");
+    return "SfxDocumentMetaData";
 }
 
 sal_Bool SAL_CALL
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 7c980be3b77f..6780825e7dcd 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -2130,7 +2130,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.sfx2.DocumentTemplates");
+        return "com.sun.star.comp.sfx2.DocumentTemplates";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index e9bc3f0aabe9..2bbdd75ae027 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -70,7 +70,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.sfx2.IFrameObject");
+        return "com.sun.star.comp.sfx2.IFrameObject";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index d4b30edfa5b2..4a1fb448b7b1 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -709,7 +709,7 @@ OUString SfxObjectShell::GetTitle( sal_uInt16  nMaxLength ) const
     {
         static bool bRecur = false;
         if ( bRecur )
-            return OUString("-not available-");
+            return "-not available-";
         bRecur = true;
 
         OUString aTitle;
diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx
index ee002aacfd93..abe4b5c63c44 100644
--- a/sfx2/source/doc/ownsubfilterservice.cxx
+++ b/sfx2/source/doc/ownsubfilterservice.cxx
@@ -96,7 +96,7 @@ void SAL_CALL OwnSubFilterService::cancel()
 
 OUString SAL_CALL OwnSubFilterService::getImplementationName()
 {
-    return OUString("com.sun.star.comp.document.OwnSubFilter");
+    return "com.sun.star.comp.document.OwnSubFilter";
 }
 
 sal_Bool SAL_CALL OwnSubFilterService::supportsService( const OUString& ServiceName )
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index c31e0d9f43d6..eafa8d955da6 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -111,19 +111,19 @@ static OUString lcl_getAppName( vcl::EnumContext::Application eApp )
     switch ( eApp )
     {
         case vcl::EnumContext::Application::Writer:
-            return OUString( "Writer" );
+            return "Writer";
             break;
         case vcl::EnumContext::Application::Calc:
-            return OUString( "Calc" );
+            return "Calc";
             break;
         case vcl::EnumContext::Application::Impress:
-            return OUString( "Impress" );
+            return "Impress";
             break;
         case vcl::EnumContext::Application::Draw:
-            return OUString( "Draw" );
+            return "Draw";
             break;
         case vcl::EnumContext::Application::Formula:
-            return OUString( "Formula" );
+            return "Formula";
             break;
         default:
             return OUString();
diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx
index cf15a8b7ff09..cfb994ac30f1 100644
--- a/sfx2/source/notify/globalevents.cxx
+++ b/sfx2/source/notify/globalevents.cxx
@@ -76,7 +76,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("com.sun.star.comp.sfx2.GlobalEventBroadcaster");
+        return "com.sun.star.comp.sfx2.GlobalEventBroadcaster";
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 48f7291e8af7..cfef7c774db0 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -341,7 +341,7 @@ static const OUString GetWindowClassification(const vcl::Window* pWindow)
     }
     else
     {
-        return OUString("window");
+        return "window";
     }
 }
 
diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx
index 0bb7b2daea70..05a6c6b93b8e 100644
--- a/sfx2/source/view/classificationcontroller.cxx
+++ b/sfx2/source/view/classificationcontroller.cxx
@@ -137,7 +137,7 @@ ClassificationCategoriesController::ClassificationCategoriesController(const uno
 
 OUString ClassificationCategoriesController::getImplementationName()
 {
-    return OUString("com.sun.star.comp.sfx2.ClassificationCategoriesController");
+    return "com.sun.star.comp.sfx2.ClassificationCategoriesController";
 }
 
 sal_Bool ClassificationCategoriesController::supportsService(const OUString& rServiceName)
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 9d609cd6a039..499149c54b83 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -753,7 +753,7 @@ void SfxFrameLoader_Impl::cancel()
 /* XServiceInfo */
 OUString SAL_CALL SfxFrameLoader_Impl::getImplementationName()
 {
-    return OUString("com.sun.star.comp.office.FrameLoader");
+    return "com.sun.star.comp.office.FrameLoader";
 }
 
 /* XServiceInfo */
diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index fb9da0d9ef40..c3e98aefe27c 100644
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -39,7 +39,7 @@ OUString SfxViewFactory::GetAPIViewName() const
         return m_sViewName;
 
     if ( GetOrdinal() == SFX_INTERFACE_NONE )
-        return OUString( "Default" );
+        return "Default";
 
     return GetLegacyViewName();
 }