diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-20 09:23:04 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-20 09:48:23 +0100 |
| commit | 227e924baeeb6087d4c49b0dd46a46b092c39ff0 (patch) | |
| tree | 4fff87a503c7faaddad069e722779020073be5eb /framework/source/services/frame.cxx | |
| parent | 6771778d2e5423c7b2d3d6f81669b5d0d0925c63 (diff) | |
Use SolarMutexGuard directly
(both users of PropertySetHelper use a SolarMutex-based ThreadHelpBase)
Change-Id: If542914bbf33a9e81f86d654498c2af04082f31d
Diffstat (limited to 'framework/source/services/frame.cxx')
| -rw-r--r-- | framework/source/services/frame.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
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 |