diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:12:45 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:29:16 +0100 |
| commit | 5fe8aa2d485104609a63237e2ef6676b36e046e9 (patch) | |
| tree | ac4651ca77b014b77a67bb4baa6dd95e16b2fca8 /framework | |
| parent | 2d604c48aa09d575f34f0e0057bff071b8c12041 (diff) | |
Use cppu::BaseMutex instead of plain osl::Mutex as base
Change-Id: I2880172edbabcd41f8847359b1b308658a9e07c8
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uiconfiguration/windowstateconfiguration.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index bd05474fbc20..4934d79eda54 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/util/XChangesBatch.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase2.hxx> #include <cppuhelper/implbase2.hxx> #include <cppuhelper/supportsservice.hxx> @@ -1282,7 +1283,7 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess() typedef ::cppu::WeakComponentImplHelper2< css::container::XNameAccess, css::lang::XServiceInfo> WindowStateConfiguration_BASE; -class WindowStateConfiguration : private osl::Mutex, +class WindowStateConfiguration : private cppu::BaseMutex, public WindowStateConfiguration_BASE { public: @@ -1342,7 +1343,7 @@ private: }; WindowStateConfiguration::WindowStateConfiguration( const Reference< XComponentContext >& rxContext ) : - WindowStateConfiguration_BASE(*static_cast<osl::Mutex *>(this)), + WindowStateConfiguration_BASE(m_aMutex), m_xContext( rxContext ) { css::uno::Reference< css::frame::XModuleManager2 > xModuleManager = |