reimplement this using standard singleton pattern

1 files changed, 7 insertions, 12 deletions

diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index 8f19fd273578..b3e2a3416ca1 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -41,6 +41,7 @@
 #include <osl/diagnose.h>
 // ---------------------------------------------------------------------------------------
 #include <rtl/bootstrap.hxx>
+#include <rtl/instance.hxx>
 #include <osl/process.h> // for osl_getExecutableFile
 #include "tools/getprocessworkingdir.hxx"
 
@@ -145,25 +146,19 @@ namespace utl
         bool initUserInstallationData(rtl::Bootstrap& _rData);
     };
 
-    static Bootstrap::Impl* s_pData = NULL;
+    namespace
+    {
+        class theImpl : public rtl::Static<Bootstrap::Impl, theImpl> {};
+    }
 
     const Bootstrap::Impl& Bootstrap::data()
     {
-        if (!s_pData)
-        {
-            using namespace osl;
-            MutexGuard aGuard( Mutex::getGlobalMutex() );
-            s_pData = new Impl;
-        }
-        return *s_pData;
+        return theImpl::get();
     }
 
     void Bootstrap::reloadData()
     {
-        if (s_pData != NULL) {
-            delete s_pData;
-            s_pData = NULL;
-        }
+        theImpl::get().initialize();
     }
 
 // ---------------------------------------------------------------------------------------