remove some more global OUStrings

Change-Id: Ic02754f98bfda3b7cd8c06857123d363a96e8d0e
Reviewed-on: https://gerrit.libreoffice.org/31071
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 4 insertions, 16 deletions

diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 545668387990..54c6be14b1bb 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -36,8 +36,6 @@
 namespace sd
 {
 
-OUString SdPhotoAlbumDialog::sDirUrl;
-
 SdPhotoAlbumDialog::SdPhotoAlbumDialog(vcl::Window* pWindow, SdDrawDocument* pActDoc)
 : ModalDialog(pWindow, "PhotoAlbumCreatorDialog", "modules/simpress/ui/photoalbum.ui"),
   pDoc(pActDoc)
@@ -73,7 +71,6 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(vcl::Window* pWindow, SdDrawDocument* pAc
     pInsTypeCombo->SetSelectHdl(LINK(this, SdPhotoAlbumDialog, TypeSelectHdl));
 
     mpGraphicFilter = new GraphicFilter;
-    sDirUrl.clear();
     pAddBtn->GrabFocus();
     pImagesLst->Clear();
 }
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
index 122380c0140c..e6541b58f38c 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
@@ -49,7 +49,6 @@ public:
     virtual void dispose() override;
 
 private:
-    static OUString sDirUrl;
     VclPtr<CancelButton>   pCancelBtn;
     VclPtr<PushButton>     pCreateBtn;
 
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx
index 76444d877893..7a46a15ccd14 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -88,7 +88,7 @@ private:
 
 //===== PresentationFactory ===================================================
 
-const OUString PresentationFactory::msPresentationViewURL("private:resource/view/Presentation");
+static const char gsPresentationViewURL[] = "private:resource/view/Presentation";
 
 PresentationFactory::PresentationFactory (
     const Reference<frame::XController>& rxController)
@@ -125,7 +125,7 @@ Reference<XResource> SAL_CALL PresentationFactory::createResource (
     ThrowIfDisposed();
 
     if (rxViewId.is())
-        if ( ! rxViewId->hasAnchor() && rxViewId->getResourceURL().equals(msPresentationViewURL))
+        if ( ! rxViewId->hasAnchor() && rxViewId->getResourceURL() == gsPresentationViewURL)
             return new PresentationView(rxViewId);
 
     return Reference<XResource>();
@@ -215,7 +215,7 @@ void SAL_CALL PresentationFactoryProvider::initialize(
             Reference<XConfigurationController> xCC (xCM->getConfigurationController());
             if (xCC.is())
                 xCC->addResourceFactory(
-                    PresentationFactory::msPresentationViewURL,
+                    gsPresentationViewURL,
                     new PresentationFactory(xController));
         }
         catch (RuntimeException&)
diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx
index 1b17080896c3..32675d122d3c 100644
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@@ -53,8 +53,6 @@ class PresentationFactory
       public PresentationFactoryInterfaceBase
 {
 public:
-    static const OUString msPresentationViewURL;
-
     PresentationFactory (
         const css::uno::Reference<css::frame::XController>& rxController);
     virtual ~PresentationFactory() override;
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index eb40f3c20984..971f408e3478 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -296,8 +296,6 @@ public:
     ToolBarRules& GetToolBarRules() { return maToolBarRules;}
 
 private:
-    const static OUString msToolBarResourcePrefix;
-
     mutable ::osl::Mutex maMutex;
     ViewShellBase& mrBase;
     std::shared_ptr<sd::tools::EventMultiplexer> mpEventMultiplexer;
@@ -511,8 +509,6 @@ void ToolBarManager::ToolBarsDestroyed()
 
 //===== ToolBarManager::Implementation =======================================
 
-const OUString ToolBarManager::Implementation::msToolBarResourcePrefix("private:resource/toolbar/");
-
 ToolBarManager::Implementation::Implementation (
     ViewShellBase& rBase,
     const std::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
@@ -894,9 +890,7 @@ IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback, void*, void)
 OUString ToolBarManager::Implementation::GetToolBarResourceName (
     const OUString& rsBaseName)
 {
-    OUString sToolBarName (msToolBarResourcePrefix);
-    sToolBarName += rsBaseName;
-    return sToolBarName;
+    return "private:resource/toolbar/" + rsBaseName;
 }
 
 bool ToolBarManager::Implementation::CheckPlugInMode (const OUString& rsName) const