loplugin:stringstatic also look for local statics

Add some API to O*StringLiteral, to make it easier
to use in some places that were using O*String

Change-Id: I1fb93bd47ac2065c9220d509aad3f4320326d99e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100270
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 63 insertions, 63 deletions

diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h
index 5af7cdd1fd36..13a9fb045f30 100644
--- a/sd/inc/strmname.h
+++ b/sd/inc/strmname.h
@@ -23,12 +23,12 @@
 #include <rtl/ustring.hxx>
 
 // PowerPoint-Filter
-const OUString pFilterPowerPoint97( "MS PowerPoint 97" );
-const OUString pFilterPowerPoint97Template( "MS PowerPoint 97 Vorlage" );
-const OUString pFilterPowerPoint97AutoPlay( "MS PowerPoint 97 AutoPlay" );
+const OUStringLiteral pFilterPowerPoint97( "MS PowerPoint 97" );
+const OUStringLiteral pFilterPowerPoint97Template( "MS PowerPoint 97 Vorlage" );
+const OUStringLiteral pFilterPowerPoint97AutoPlay( "MS PowerPoint 97 AutoPlay" );
 
 // XML content stream
-const OUString pStarDrawXMLContent( "content.xml" );
+const OUStringLiteral pStarDrawXMLContent( "content.xml" );
 
 #endif // INCLUDED_SD_INC_STRMNAME_H
 
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index 796f9c083bef..cb0852345e45 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -39,7 +39,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
     SdFuncPtrCreateDialogFactory fp = nullptr;
 #ifndef DISABLE_DYNLOADING
     static ::osl::Module aDialogLibrary;
-    static const OUString sLibName(SDUI_DLL_NAME);
+    static const OUStringLiteral sLibName(SDUI_DLL_NAME);
     if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) )
         fp = reinterpret_cast<SdAbstractDialogFactory* (SAL_CALL*)()>(
             aDialogLibrary.getFunctionSymbol( "SdCreateDialogFactory" ));
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index d969d60a1465..d1c5efd829de 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -175,7 +175,7 @@ namespace {
 
 // Pane URLS.
 
-const OUString FrameworkHelper::msPaneURLPrefix("private:resource/pane/");
+const OUStringLiteral FrameworkHelper::msPaneURLPrefix("private:resource/pane/");
 const OUString FrameworkHelper::msCenterPaneURL( msPaneURLPrefix + "CenterPane");
 const OUString FrameworkHelper::msFullScreenPaneURL( msPaneURLPrefix + "FullScreenPane");
 const OUString FrameworkHelper::msLeftImpressPaneURL( msPaneURLPrefix + "LeftImpressPane");
@@ -184,7 +184,7 @@ const OUString FrameworkHelper::msSidebarPaneURL( msPaneURLPrefix + "SidebarPane
 
 // View URLs.
 
-const OUString FrameworkHelper::msViewURLPrefix("private:resource/view/");
+const OUStringLiteral FrameworkHelper::msViewURLPrefix("private:resource/view/");
 const OUString FrameworkHelper::msImpressViewURL( msViewURLPrefix + "ImpressView");
 const OUString FrameworkHelper::msDrawViewURL( msViewURLPrefix + "GraphicView");
 const OUString FrameworkHelper::msOutlineViewURL( msViewURLPrefix + "OutlineView");
@@ -196,11 +196,11 @@ const OUString FrameworkHelper::msSidebarViewURL( msViewURLPrefix + "SidebarView
 
 // Tool bar URLs.
 
-const OUString FrameworkHelper::msToolBarURLPrefix("private:resource/toolbar/");
+const OUStringLiteral FrameworkHelper::msToolBarURLPrefix("private:resource/toolbar/");
 const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBar");
 
 // Task panel URLs.
-const OUString FrameworkHelper::msTaskPanelURLPrefix( "private:resource/toolpanel/" );
+const OUStringLiteral FrameworkHelper::msTaskPanelURLPrefix( "private:resource/toolpanel/" );
 const OUString FrameworkHelper::msAllMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "AllMasterPages" );
 const OUString FrameworkHelper::msRecentMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "RecentMasterPages" );
 const OUString FrameworkHelper::msUsedMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "UsedMasterPages" );
@@ -210,17 +210,17 @@ const OUString FrameworkHelper::msCustomAnimationTaskPanelURL( msTaskPanelURLPre
 const OUString FrameworkHelper::msSlideTransitionTaskPanelURL( msTaskPanelURLPrefix + "SlideTransitions" );
 
 // Event URLs.
-const OUString FrameworkHelper::msResourceActivationRequestEvent( "ResourceActivationRequested" );
-const OUString FrameworkHelper::msResourceDeactivationRequestEvent( "ResourceDeactivationRequest" );
-const OUString FrameworkHelper::msResourceActivationEvent( "ResourceActivation" );
-const OUString FrameworkHelper::msResourceDeactivationEvent( "ResourceDeactivation" );
-const OUString FrameworkHelper::msResourceDeactivationEndEvent( "ResourceDeactivationEnd" );
-const OUString FrameworkHelper::msConfigurationUpdateStartEvent( "ConfigurationUpdateStart" );
-const OUString FrameworkHelper::msConfigurationUpdateEndEvent( "ConfigurationUpdateEnd" );
+const OUStringLiteral FrameworkHelper::msResourceActivationRequestEvent( "ResourceActivationRequested" );
+const OUStringLiteral FrameworkHelper::msResourceDeactivationRequestEvent( "ResourceDeactivationRequest" );
+const OUStringLiteral FrameworkHelper::msResourceActivationEvent( "ResourceActivation" );
+const OUStringLiteral FrameworkHelper::msResourceDeactivationEvent( "ResourceDeactivation" );
+const OUStringLiteral FrameworkHelper::msResourceDeactivationEndEvent( "ResourceDeactivationEnd" );
+const OUStringLiteral FrameworkHelper::msConfigurationUpdateStartEvent( "ConfigurationUpdateStart" );
+const OUStringLiteral FrameworkHelper::msConfigurationUpdateEndEvent( "ConfigurationUpdateEnd" );
 
 // Service names of controllers.
-const OUString FrameworkHelper::msModuleControllerService("com.sun.star.drawing.framework.ModuleController");
-const OUString FrameworkHelper::msConfigurationControllerService("com.sun.star.drawing.framework.ConfigurationController");
+const OUStringLiteral FrameworkHelper::msModuleControllerService("com.sun.star.drawing.framework.ModuleController");
+const OUStringLiteral FrameworkHelper::msConfigurationControllerService("com.sun.star.drawing.framework.ConfigurationController");
 
 //----- helper ----------------------------------------------------------------
 namespace
diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx
index b6e8dc7d2b92..a7577b444870 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -97,21 +97,21 @@ public:
 
     /** The set of tool bars that are handled by this manager class.
     */
-    const static OUString msToolBar;                  // Draw_Toolbox_Sd, 23011
-    const static OUString msOptionsToolBar;           // Draw_Options_Toolbox, 23020
-    const static OUString msCommonTaskToolBar;        // Draw_CommonTask_Toolbox, 23021
-    const static OUString msViewerToolBar;            // Draw_Viewer_Toolbox, 23023
-    const static OUString msSlideSorterToolBar;       // Slide_Toolbox, 23012
-    const static OUString msSlideSorterObjectBar;     // Slide_Obj_Toolbox, 23014
-    const static OUString msOutlineToolBar;           // Outline_Toolbox, 23017
-    const static OUString msMasterViewToolBar;        // SID_MASTERPAGE, 27053
-    const static OUString msDrawingObjectToolBar;     // Draw_Obj_Toolbox, 23013
-    const static OUString msGluePointsToolBar;        // Gluepoints_Toolbox, 23019
-    const static OUString msTextObjectBar;            // Draw_Text_Toolbox_Sd, 23016
-    const static OUString msBezierObjectBar;          // Bezier_Toolbox_Sd, 23015
-    const static OUString msGraphicObjectBar;         // Draw_Graf_Toolbox, 23030
-    const static OUString msMediaObjectBar;           // Draw_Media_Toolbox, 23031
-    const static OUString msTableObjectBar;           // Draw_Table_Toolbox, 23018
+    const static OUStringLiteral msToolBar;                  // Draw_Toolbox_Sd, 23011
+    const static OUStringLiteral msOptionsToolBar;           // Draw_Options_Toolbox, 23020
+    const static OUStringLiteral msCommonTaskToolBar;        // Draw_CommonTask_Toolbox, 23021
+    const static OUStringLiteral msViewerToolBar;            // Draw_Viewer_Toolbox, 23023
+    const static OUStringLiteral msSlideSorterToolBar;       // Slide_Toolbox, 23012
+    const static OUStringLiteral msSlideSorterObjectBar;     // Slide_Obj_Toolbox, 23014
+    const static OUStringLiteral msOutlineToolBar;           // Outline_Toolbox, 23017
+    const static OUStringLiteral msMasterViewToolBar;        // SID_MASTERPAGE, 27053
+    const static OUStringLiteral msDrawingObjectToolBar;     // Draw_Obj_Toolbox, 23013
+    const static OUStringLiteral msGluePointsToolBar;        // Gluepoints_Toolbox, 23019
+    const static OUStringLiteral msTextObjectBar;            // Draw_Text_Toolbox_Sd, 23016
+    const static OUStringLiteral msBezierObjectBar;          // Bezier_Toolbox_Sd, 23015
+    const static OUStringLiteral msGraphicObjectBar;         // Draw_Graf_Toolbox, 23030
+    const static OUStringLiteral msMediaObjectBar;           // Draw_Media_Toolbox, 23031
+    const static OUStringLiteral msTableObjectBar;           // Draw_Table_Toolbox, 23018
 
     /** The set of tool bar groups.
     */
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index fe964e2eb015..a144cc243166 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -56,7 +56,7 @@ class FrameworkHelper
 {
 public:
     // URLs of frequently used panes.
-    static const OUString msPaneURLPrefix;
+    static const OUStringLiteral msPaneURLPrefix;
     static const OUString msCenterPaneURL;
     static const OUString msFullScreenPaneURL;
     static const OUString msLeftImpressPaneURL;
@@ -64,7 +64,7 @@ public:
     static const OUString msSidebarPaneURL;
 
     // URLs of frequently used views.
-    static const OUString msViewURLPrefix;
+    static const OUStringLiteral msViewURLPrefix;
     static const OUString msImpressViewURL;
     static const OUString msDrawViewURL;
     static const OUString msOutlineViewURL;
@@ -75,11 +75,11 @@ public:
     static const OUString msSidebarViewURL;
 
     // URLs of frequently used tool bars.
-    static const OUString msToolBarURLPrefix;
+    static const OUStringLiteral msToolBarURLPrefix;
     static const OUString msViewTabBarURL;
 
     // URLs of task panels.
-    static const OUString msTaskPanelURLPrefix;
+    static const OUStringLiteral msTaskPanelURLPrefix;
     static const OUString msAllMasterPagesTaskPanelURL;
     static const OUString msRecentMasterPagesTaskPanelURL;
     static const OUString msUsedMasterPagesTaskPanelURL;
@@ -89,17 +89,17 @@ public:
     static const OUString msSlideTransitionTaskPanelURL;
 
     // Names of frequently used events.
-    static const OUString msResourceActivationRequestEvent;
-    static const OUString msResourceDeactivationRequestEvent;
-    static const OUString msResourceActivationEvent;
-    static const OUString msResourceDeactivationEvent;
-    static const OUString msResourceDeactivationEndEvent;
-    static const OUString msConfigurationUpdateStartEvent;
-    static const OUString msConfigurationUpdateEndEvent;
+    static const OUStringLiteral msResourceActivationRequestEvent;
+    static const OUStringLiteral msResourceDeactivationRequestEvent;
+    static const OUStringLiteral msResourceActivationEvent;
+    static const OUStringLiteral msResourceDeactivationEvent;
+    static const OUStringLiteral msResourceDeactivationEndEvent;
+    static const OUStringLiteral msConfigurationUpdateStartEvent;
+    static const OUStringLiteral msConfigurationUpdateEndEvent;
 
     // Service names of the common controllers.
-    static const OUString msModuleControllerService;
-    static const OUString msConfigurationControllerService;
+    static const OUStringLiteral msModuleControllerService;
+    static const OUStringLiteral msConfigurationControllerService;
 
     /** Return the FrameworkHelper object that is associated with the given
         ViewShellBase.  If such an object does not yet exist, a new one is
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 786effb8b8eb..274c3c1a8daa 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -208,9 +208,9 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
     else
         return "";
 
-    static const OUString sNotesShapeName (
+    static const OUStringLiteral sNotesShapeName (
         "com.sun.star.presentation.NotesShape" );
-    static const OUString sTextShapeName (
+    static const OUStringLiteral sTextShapeName (
         "com.sun.star.drawing.TextShape" );
 
     if (aNotesPage.is())
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index e540c2cc83a7..7f084e3952e7 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -328,21 +328,21 @@ private:
 
 //===== ToolBarManager ========================================================
 
-const OUString ToolBarManager::msToolBar("toolbar");
-const OUString ToolBarManager::msOptionsToolBar("optionsbar");
-const OUString ToolBarManager::msCommonTaskToolBar("commontaskbar");
-const OUString ToolBarManager::msViewerToolBar("viewerbar");
-const OUString ToolBarManager::msSlideSorterToolBar("slideviewtoolbar");
-const OUString ToolBarManager::msSlideSorterObjectBar("slideviewobjectbar");
-const OUString ToolBarManager::msOutlineToolBar("outlinetoolbar");
-const OUString ToolBarManager::msMasterViewToolBar("masterviewtoolbar");
-const OUString ToolBarManager::msDrawingObjectToolBar("drawingobjectbar");
-const OUString ToolBarManager::msGluePointsToolBar("gluepointsobjectbar");
-const OUString ToolBarManager::msTextObjectBar("textobjectbar");
-const OUString ToolBarManager::msBezierObjectBar("bezierobjectbar");
-const OUString ToolBarManager::msGraphicObjectBar("graphicobjectbar");
-const OUString ToolBarManager::msMediaObjectBar("mediaobjectbar");
-const OUString ToolBarManager::msTableObjectBar("tableobjectbar");
+const OUStringLiteral ToolBarManager::msToolBar("toolbar");
+const OUStringLiteral ToolBarManager::msOptionsToolBar("optionsbar");
+const OUStringLiteral ToolBarManager::msCommonTaskToolBar("commontaskbar");
+const OUStringLiteral ToolBarManager::msViewerToolBar("viewerbar");
+const OUStringLiteral ToolBarManager::msSlideSorterToolBar("slideviewtoolbar");
+const OUStringLiteral ToolBarManager::msSlideSorterObjectBar("slideviewobjectbar");
+const OUStringLiteral ToolBarManager::msOutlineToolBar("outlinetoolbar");
+const OUStringLiteral ToolBarManager::msMasterViewToolBar("masterviewtoolbar");
+const OUStringLiteral ToolBarManager::msDrawingObjectToolBar("drawingobjectbar");
+const OUStringLiteral ToolBarManager::msGluePointsToolBar("gluepointsobjectbar");
+const OUStringLiteral ToolBarManager::msTextObjectBar("textobjectbar");
+const OUStringLiteral ToolBarManager::msBezierObjectBar("bezierobjectbar");
+const OUStringLiteral ToolBarManager::msGraphicObjectBar("graphicobjectbar");
+const OUStringLiteral ToolBarManager::msMediaObjectBar("mediaobjectbar");
+const OUStringLiteral ToolBarManager::msTableObjectBar("tableobjectbar");
 
 std::shared_ptr<ToolBarManager> ToolBarManager::Create (
     ViewShellBase& rBase,