rtl::Static -> thread-safe static local

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

2 files changed, 4 insertions, 17 deletions

diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx
index 86c280b4b352..512ddb095cd2 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -25,7 +25,6 @@
 #include <unordered_map>
 
 #include <osl/diagnose.h>
-#include <rtl/instance.hxx>
 #include <sal/log.hxx>
 
 #include <uno/threadpool.h>
@@ -43,21 +42,10 @@ namespace cppu_threadpool
         rtl::Reference<ORequestThread> const & theThread): thread(theThread)
     {}
 
-    namespace {
-
-    struct theDisposedCallerAdmin :
-        public rtl::StaticWithInit< DisposedCallerAdminHolder, theDisposedCallerAdmin >
-    {
-        DisposedCallerAdminHolder operator () () {
-            return std::make_shared<DisposedCallerAdmin>();
-        }
-    };
-
-    }
-
     DisposedCallerAdminHolder const & DisposedCallerAdmin::getInstance()
     {
-        return theDisposedCallerAdmin::get();
+        static DisposedCallerAdminHolder theDisposedCallerAdmin =  std::make_shared<DisposedCallerAdmin>();
+        return theDisposedCallerAdmin;
     }
 
     DisposedCallerAdmin::~DisposedCallerAdmin()
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 03dbc99eafcc..ad61cee0cf67 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -819,11 +819,10 @@ namespace
         const OUString& getOIdPart() const { return m_sOidPart; }
     };
 
-    class theStaticOIdPart : public rtl::Static<makeOIdPart, theStaticOIdPart> {};
-
 const OUString & unoenv_getStaticOIdPart()
 {
-    return theStaticOIdPart::get().getOIdPart();
+    static makeOIdPart theStaticOIdPart;
+    return theStaticOIdPart.getOIdPart();
 }
 
 }