Use SolarMutexGuard directly

(both users of PropertySetHelper use a SolarMutex-based ThreadHelpBase)

Change-Id: If542914bbf33a9e81f86d654498c2af04082f31d

4 files changed, 35 insertions, 51 deletions

diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index a297628b67be..d8baf70a8e9f 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -70,7 +70,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
         // hold it weak ... otherwise this helper has to be "killed" explicitly .-)
         css::uno::WeakReference< css::uno::XInterface > m_xBroadcaster;
 
-        LockHelper& m_rLock;
         TransactionManager& m_rTransactionManager;
 
 
@@ -80,11 +79,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
 
         /** initialize new instance of this helper.
          *
-         *  @param  pExternalLock
-         *          this helper must be used as a baseclass ...
-         *          but then it should synchronize its own calls
-         *          with the same lock then it's superclass uses.
-         *
          *  @param  pExternalTransactionManager
          *          this helper must be used as a baseclass ...
          *          but then it should synchronize its own calls
@@ -93,7 +87,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
          *  @param  bReleaseLockOnCall
          *          see member m_bReleaseLockOnCall
          */
-        PropertySetHelper(      LockHelper*                                             pExternalLock               ,
+        PropertySetHelper(      osl::Mutex & mutex,
                                 TransactionManager*                                     pExternalTransactionManager ,
                                 sal_Bool                                                bReleaseLockOnCall          );
 
diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx
index 6e8cb073d699..636b5df45bdb 100644
--- a/framework/source/fwi/classes/propertysethelper.cxx
+++ b/framework/source/fwi/classes/propertysethelper.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <vcl/svapp.hxx>
+
 #include <classes/propertysethelper.hxx>
 #include <threadhelp/transactionguard.hxx>
 #include <threadhelp/guard.hxx>
@@ -25,13 +29,12 @@ namespace framework{
 
 
 
-PropertySetHelper::PropertySetHelper(      LockHelper*                                             pExternalLock               ,
+PropertySetHelper::PropertySetHelper(      osl::Mutex & mutex,
                                            TransactionManager*                                     pExternalTransactionManager ,
                                            sal_Bool                                                bReleaseLockOnCall          )
-    : m_lSimpleChangeListener(pExternalLock->getShareableOslMutex())
-    , m_lVetoChangeListener  (pExternalLock->getShareableOslMutex())
+    : m_lSimpleChangeListener(mutex)
+    , m_lVetoChangeListener  (mutex)
     , m_bReleaseLockOnCall   (bReleaseLockOnCall                   )
-    , m_rLock                (*pExternalLock                       )
     , m_rTransactionManager  (*pExternalTransactionManager         )
 {
 }
@@ -46,11 +49,8 @@ void PropertySetHelper::impl_setPropertyChangeBroadcaster(const css::uno::Refere
 {
     TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS);
 
-    // SAFE ->
-    Guard aWriteLock(m_rLock);
+    SolarMutexGuard g;
     m_xBroadcaster = xBroadcaster;
-    aWriteLock.unlock();
-    // <- SAFE
 }
 
 
@@ -60,15 +60,13 @@ void SAL_CALL PropertySetHelper::impl_addPropertyInfo(const css::beans::Property
 {
     TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS);
 
-    // SAFE ->
-    Guard aWriteLock(m_rLock);
+    SolarMutexGuard g;
 
     PropertySetHelper::TPropInfoHash::const_iterator pIt = m_lProps.find(aProperty.Name);
     if (pIt != m_lProps.end())
         throw css::beans::PropertyExistException();
 
     m_lProps[aProperty.Name] = aProperty;
-    // <- SAFE
 }
 
 
@@ -78,15 +76,13 @@ void SAL_CALL PropertySetHelper::impl_removePropertyInfo(const OUString& sProper
 {
     TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS);
 
-    // SAFE ->
-    Guard aWriteLock(m_rLock);
+    SolarMutexGuard g;
 
     PropertySetHelper::TPropInfoHash::iterator pIt = m_lProps.find(sProperty);
     if (pIt == m_lProps.end())
         throw css::beans::UnknownPropertyException();
 
     m_lProps.erase(pIt);
-    // <- SAFE
 }
 
 
@@ -99,8 +95,7 @@ void SAL_CALL PropertySetHelper::impl_disablePropertySet()
 {
     TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS);
 
-    // SAFE ->
-    Guard aWriteLock(m_rLock);
+    SolarMutexGuard g;
 
     css::uno::Reference< css::uno::XInterface > xThis(static_cast< css::beans::XPropertySet* >(this), css::uno::UNO_QUERY);
     css::lang::EventObject aEvent(xThis);
@@ -108,9 +103,6 @@ void SAL_CALL PropertySetHelper::impl_disablePropertySet()
     m_lSimpleChangeListener.disposeAndClear(aEvent);
     m_lVetoChangeListener.disposeAndClear(aEvent);
     m_lProps.free();
-
-    aWriteLock.unlock();
-    // <- SAFE
 }
 
 
@@ -193,7 +185,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty,
     TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS);
 
     // SAFE ->
-    Guard aWriteLock(m_rLock);
+    SolarMutexResettableGuard aWriteLock;
 
     PropertySetHelper::TPropInfoHash::const_iterator pIt = m_lProps.find(sProperty);
     if (pIt == m_lProps.end())
@@ -204,7 +196,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty,
     sal_Bool bLocked = sal_True;
     if (m_bReleaseLockOnCall)
     {
-        aWriteLock.unlock();
+        aWriteLock.clear();
         bLocked = sal_False;
         // <- SAFE
     }
@@ -214,7 +206,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty,
     if (! bLocked)
     {
         // SAFE ->
-        aWriteLock.lock();
+        aWriteLock.reset();
         bLocked = sal_True;
     }
 
@@ -232,7 +224,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty,
 
     if (m_bReleaseLockOnCall)
     {
-        aWriteLock.unlock();
+        aWriteLock.clear();
         bLocked = sal_False;
         // <- SAFE
     }
@@ -254,7 +246,7 @@ css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const OUString& sProp
     TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS);
 
     // SAFE ->
-    Guard aReadLock(m_rLock);
+    SolarMutexClearableGuard aReadLock;
 
     PropertySetHelper::TPropInfoHash::const_iterator pIt = m_lProps.find(sProperty);
     if (pIt == m_lProps.end())
@@ -263,7 +255,7 @@ css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const OUString& sProp
     css::beans::Property aPropInfo = pIt->second;
 
     if (m_bReleaseLockOnCall)
-        aReadLock.unlock();
+        aReadLock.clear();
 
     return impl_getPropertyValue(aPropInfo.Name, aPropInfo.Handle);
 }
@@ -278,13 +270,13 @@ void SAL_CALL PropertySetHelper::addPropertyChangeListener(const OUString&
     TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS);
 
     // SAFE ->
-    Guard aReadLock(m_rLock);
+    SolarMutexClearableGuard aReadLock;
 
     PropertySetHelper::TPropInfoHash::const_iterator pIt = m_lProps.find(sProperty);
     if (pIt == m_lProps.end())
         throw css::beans::UnknownPropertyException();
 
-    aReadLock.unlock();
+    aReadLock.clear();
     // <- SAFE
 
     m_lSimpleChangeListener.addInterface(sProperty, xListener);
@@ -300,13 +292,13 @@ void SAL_CALL PropertySetHelper::removePropertyChangeListener(const OUString&
     TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS);
 
     // SAFE ->
-    Guard aReadLock(m_rLock);
+    SolarMutexClearableGuard aReadLock;
 
     PropertySetHelper::TPropInfoHash::const_iterator pIt = m_lProps.find(sProperty);
     if (pIt == m_lProps.end())
         throw css::beans::UnknownPropertyException();
 
-    aReadLock.unlock();
+    aReadLock.clear();
     // <- SAFE
 
     m_lSimpleChangeListener.removeInterface(sProperty, xListener);
@@ -322,13 +314,13 @@ void SAL_CALL PropertySetHelper::addVetoableChangeListener(const OUString&
     TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS);
 
     // SAFE ->
-    Guard aReadLock(m_rLock);
+    SolarMutexClearableGuard aReadLock;
 
     PropertySetHelper::TPropInfoHash::const_iterator pIt = m_lProps.find(sProperty);
     if (pIt == m_lProps.end())
         throw css::beans::UnknownPropertyException();
 
-    aReadLock.unlock();
+    aReadLock.clear();
     // <- SAFE
 
     m_lVetoChangeListener.addInterface(sProperty, xListener);
@@ -344,13 +336,13 @@ void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const OUString&
     TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS);
 
     // SAFE ->
-    Guard aReadLock(m_rLock);
+    SolarMutexClearableGuard aReadLock;
 
     PropertySetHelper::TPropInfoHash::const_iterator pIt = m_lProps.find(sProperty);
     if (pIt == m_lProps.end())
         throw css::beans::UnknownPropertyException();
 
-    aReadLock.unlock();
+    aReadLock.clear();
     // <- SAFE
 
     m_lVetoChangeListener.removeInterface(sProperty, xListener);
@@ -362,8 +354,7 @@ css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProper
 {
     TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS);
 
-    // SAFE ->
-    Guard aReadLock(m_rLock);
+    SolarMutexGuard g;
 
     sal_Int32                                        c     = (sal_Int32)m_lProps.size();
     css::uno::Sequence< css::beans::Property >       lProps(c);
@@ -377,7 +368,6 @@ css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProper
     }
 
     return lProps;
-    // <- SAFE
 }
 
 
@@ -387,15 +377,13 @@ css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const OUStrin
 {
     TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS);
 
-    // SAFE ->
-    Guard aReadLock(m_rLock);
+    SolarMutexGuard g;
 
     PropertySetHelper::TPropInfoHash::const_iterator pIt = m_lProps.find(sName);
     if (pIt == m_lProps.end())
         throw css::beans::UnknownPropertyException();
 
     return pIt->second;
-    // <- SAFE
 }
 
 
@@ -404,14 +392,12 @@ sal_Bool SAL_CALL PropertySetHelper::hasPropertyByName(const OUString& sName)
 {
     TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS);
 
-    // SAFE ->
-    Guard aReadLock(m_rLock);
+    SolarMutexGuard g;
 
     PropertySetHelper::TPropInfoHash::iterator pIt    = m_lProps.find(sName);
     sal_Bool                                   bExist = (pIt != m_lProps.end());
 
     return bExist;
-    // <- SAFE
 }
 
 } // namespace framework
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 4d571e31405f..293f456c8c24 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -66,6 +66,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <comphelper/sequenceashashmap.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/factory.hxx>
@@ -143,6 +144,7 @@ class Frame :   // interfaces
                 // Order is necessary for right initialization of this class!
                 public  ThreadHelpBase                              ,
                 public  TransactionBase                             ,
+                private cppu::BaseMutex,
                 public  PropertySetHelper                           ,   // helper implements ThreadHelpbase, TransactionBase, XPropertySet, XPropertySetInfo
                 public  ::cppu::OWeakObject                             // helper implements XInterface, XWeak
 {
@@ -559,7 +561,7 @@ DEFINE_XTYPEPROVIDER_21             (   Frame
 Frame::Frame( const css::uno::Reference< css::uno::XComponentContext >& xContext )
         :   ThreadHelpBase              ( &Application::GetSolarMutex()                     )
         ,   TransactionBase             (                                                   )
-        ,   PropertySetHelper           ( &m_aLock,
+        ,   PropertySetHelper           ( m_aMutex,
                                           &m_aTransactionManager,
                                           sal_False) // sal_False => dont release shared mutex on calling us!
         //  init member
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 65d7110a8f64..ed22520e1788 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
@@ -89,6 +90,7 @@ class TabWindowService :  public css::lang::XTypeProvider
                          ,  public css::lang::XComponent
                          ,  public ThreadHelpBase
                          ,  public TransactionBase
+                         , private cppu::BaseMutex
                          ,  public PropertySetHelper
                          ,  public ::cppu::OWeakObject
 {
@@ -214,7 +216,7 @@ TabWindowService::TabWindowService()
         //      baseclasses and then members. And we need the mutex for other baseclasses !!!
         :   ThreadHelpBase          ( &Application::GetSolarMutex() )
         ,   TransactionBase         (                               )
-        ,   PropertySetHelper       ( &m_aLock                      ,
+        ,   PropertySetHelper       ( m_aMutex,
                                       &m_aTransactionManager        ,
                                       sal_False                     ) // sal_False => dont release shared mutex on calling us!
         ,   OWeakObject             (                               )