Move SolarMutex down from tools to comphelper/ to make life easier.

Change-Id: I7dd21f30daa27e5de2848eb16aee9a610dd629d5
Reviewed-on: https://gerrit.libreoffice.org/19271
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>

1 files changed, 2 insertions, 7 deletions

diff --git a/tools/source/misc/solarmutex.cxx b/tools/source/misc/solarmutex.cxx
index f71899901f7e..66029398a619 100644
--- a/tools/source/misc/solarmutex.cxx
+++ b/tools/source/misc/solarmutex.cxx
@@ -21,15 +21,9 @@
 
 namespace tools
 {
-    static comphelper::SolarMutex* pSolarMutex = 0;
-
-    void SolarMutex::SetSolarMutex( comphelper::SolarMutex* pMutex )
-    {
-        pSolarMutex = pMutex;
-    }
-
     bool SolarMutex::Acquire()
     {
+        comphelper::SolarMutex *pSolarMutex = comphelper::SolarMutex::get();
         if ( pSolarMutex )
             pSolarMutex->acquire();
         else
@@ -39,6 +33,7 @@ namespace tools
 
     void SolarMutex::Release()
     {
+        comphelper::SolarMutex *pSolarMutex = comphelper::SolarMutex::get();
         if ( pSolarMutex )
             pSolarMutex->release();
     }