diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:09:57 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:29:15 +0100 |
| commit | 075fbcee09f1c14b8dbed8e3a0c54ae26a47e102 (patch) | |
| tree | 7163b94d489c765147078b0c19333878219741a7 /framework/source/services/substitutepathvars.cxx | |
| parent | bcb01dd1df002c917ccd2f5c358e550eed734798 (diff) | |
Use cppu::BaseMutex instead of plain osl::Mutex as base
Change-Id: I89d6b03a66046a662dcacee75bdf53a65903e148
Diffstat (limited to 'framework/source/services/substitutepathvars.cxx')
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index a87dd8974f92..9fc8ae5a2d19 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -21,6 +21,7 @@ #include <helper/networkdomain.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase2.hxx> #include <cppuhelper/supportsservice.hxx> #include <unotools/configitem.hxx> @@ -237,7 +238,7 @@ typedef ::cppu::WeakComponentImplHelper2< css::util::XStringSubstitution, css::lang::XServiceInfo > SubstitutePathVariables_BASE; -class SubstitutePathVariables : private osl::Mutex, +class SubstitutePathVariables : private cppu::BaseMutex, public SubstitutePathVariables_BASE { friend class SubstitutePathVariables_Impl; @@ -747,7 +748,7 @@ void SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration( } SubstitutePathVariables::SubstitutePathVariables( const Reference< XComponentContext >& xContext ) : - SubstitutePathVariables_BASE(*static_cast<osl::Mutex *>(this)), + SubstitutePathVariables_BASE(m_aMutex), m_aImpl( LINK( this, SubstitutePathVariables, implts_ConfigurationNotify )), m_xContext( xContext ) { |