rtl::Static -> static local

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

3 files changed, 8 insertions, 21 deletions

diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index b98b376348f4..674a242e48c0 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1185,13 +1185,12 @@ namespace numfunc
             std::unique_ptr<vcl::Font> mpFont;
     };
 
-        class theSwDefBulletConfig
-            : public rtl::Static<SwDefBulletConfig, theSwDefBulletConfig>{};
     }
 
     SwDefBulletConfig& SwDefBulletConfig::getInstance()
     {
-        return theSwDefBulletConfig::get();
+        static SwDefBulletConfig theSwDefBulletConfig;
+        return theSwDefBulletConfig;
     }
 
     SwDefBulletConfig::SwDefBulletConfig()
@@ -1384,12 +1383,12 @@ namespace numfunc
             bool mbChangeIndentOnTabAtFirstPosOfFirstListItem;
     };
 
-        class theSwNumberingUIBehaviorConfig : public rtl::Static<SwNumberingUIBehaviorConfig, theSwNumberingUIBehaviorConfig>{};
     }
 
     SwNumberingUIBehaviorConfig& SwNumberingUIBehaviorConfig::getInstance()
     {
-        return theSwNumberingUIBehaviorConfig::get();
+        static SwNumberingUIBehaviorConfig theSwNumberingUIBehaviorConfig;
+        return theSwNumberingUIBehaviorConfig;
     }
 
     SwNumberingUIBehaviorConfig::SwNumberingUIBehaviorConfig()
diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx
index 4f81fd02f975..5612096c1fc4 100644
--- a/sw/source/core/docnode/retrievedinputstreamdata.cxx
+++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx
@@ -25,17 +25,10 @@
 
 SwRetrievedInputStreamDataManager::tDataKey SwRetrievedInputStreamDataManager::snNextKeyValue = 1;
 
-namespace
-{
-    class theSwRetrievedInputStreamDataManager :
-        public rtl::Static< SwRetrievedInputStreamDataManager, theSwRetrievedInputStreamDataManager>
-    {
-    };
-}
-
 SwRetrievedInputStreamDataManager& SwRetrievedInputStreamDataManager::GetManager()
 {
-    return theSwRetrievedInputStreamDataManager::get();
+    static SwRetrievedInputStreamDataManager theSwRetrievedInputStreamDataManager;
+    return theSwRetrievedInputStreamDataManager;
 }
 
 SwRetrievedInputStreamDataManager::tDataKey SwRetrievedInputStreamDataManager::ReserveData(
diff --git a/sw/source/core/docnode/swthreadmanager.cxx b/sw/source/core/docnode/swthreadmanager.cxx
index 0409e5a96200..3c81ff57016c 100644
--- a/sw/source/core/docnode/swthreadmanager.cxx
+++ b/sw/source/core/docnode/swthreadmanager.cxx
@@ -39,15 +39,10 @@ SwThreadManager::~SwThreadManager()
 {
 }
 
-namespace {
-
-struct InitInstance : public rtl::Static<SwThreadManager, InitInstance> {};
-
-}
-
 SwThreadManager& SwThreadManager::GetThreadManager()
 {
-    return InitInstance::get();
+    static SwThreadManager gThreadManager;
+    return gThreadManager;
 }
 
 bool SwThreadManager::ExistsThreadManager()