use rtl::Static where double-locked pattern used

1 files changed, 7 insertions, 11 deletions

diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index ccdbe1f26fca..20abfff2654e 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -593,20 +593,16 @@
         return new OCommonGeometryControlModel( _rxAggregateInstance, m_sServiceSpecifier );
     }
 
+    namespace
+    {
+        class theOCommonGeometryControlModelImplementationId :
+            public rtl::Static< ::cppu::OImplementationId, theOCommonGeometryControlModelImplementationId > {};
+    }
+
     //--------------------------------------------------------------------
     Sequence< sal_Int8 > SAL_CALL OCommonGeometryControlModel::getImplementationId(  ) throw (RuntimeException)
     {
-        static ::cppu::OImplementationId * pId = NULL;
-        if ( !pId )
-        {
-            ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-            if ( !pId )
-            {
-                static ::cppu::OImplementationId s_aId;
-                pId = &s_aId;
-            }
-        }
-        return pId->getImplementationId();
+        return theOCommonGeometryControlModelImplementationId::get().getImplementationId();
     }
 
     //--------------------------------------------------------------------