summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-18 13:09:07 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-18 13:29:15 +0100
commitbcb01dd1df002c917ccd2f5c358e550eed734798 (patch)
treeb88ec94810e6c9eb891652b0c05b614532228fb0 /framework
parent0a08f14961e2c49fcd69fa86147ea59e38381d10 (diff)
Use cppu::BaseMutex instead of plain osl::Mutex as base
Change-Id: I1330f76e3137aaa8d00de82f136ee6968196db70
Diffstat (limited to 'framework')
-rw-r--r--framework/source/services/pathsettings.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index b3434ba93885..294b921a95e4 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -36,6 +36,7 @@
#include <tools/urlobj.hxx>
#include <rtl/ustrbuf.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/compbase3.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -84,7 +85,7 @@ typedef ::cppu::WeakComponentImplHelper3<
css::util::XPathSettings> // => XPropertySet
PathSettings_BASE;
-class PathSettings : private osl::Mutex
+class PathSettings : private cppu::BaseMutex
, public PathSettings_BASE
, public ::cppu::OPropertySetHelper
{
@@ -458,7 +459,7 @@ private:
PathSettings::PathSettings( const css::uno::Reference< css::uno::XComponentContext >& xContext )
- : PathSettings_BASE(*(static_cast<osl::Mutex *>(this)))
+ : PathSettings_BASE(m_aMutex)
, ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper)
, m_xContext (xContext)
, m_pPropHelp(0 )