diff options
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/expand/ucpexpand.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index aa2f7a87dd2e..5b880a3d2a4d 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -22,6 +22,7 @@ #include <osl/mutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/factory.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include <ucbhelper/content.hxx> @@ -41,16 +42,11 @@ using namespace ::com::sun::star; namespace { -struct MutexHolder -{ - mutable ::osl::Mutex m_mutex; -}; - typedef ::cppu::WeakComponentImplHelper< lang::XServiceInfo, ucb::XContentProvider > t_impl_helper; -class ExpandContentProviderImpl : protected MutexHolder, public t_impl_helper +class ExpandContentProviderImpl : protected cppu::BaseMutex, public t_impl_helper { uno::Reference< uno::XComponentContext > m_xComponentContext; uno::Reference< util::XMacroExpander > m_xMacroExpander; @@ -64,7 +60,7 @@ protected: public: explicit ExpandContentProviderImpl( uno::Reference< uno::XComponentContext > const & xComponentContext ) - : t_impl_helper( m_mutex ), + : t_impl_helper( m_aMutex ), m_xComponentContext( xComponentContext ), m_xMacroExpander( util::theMacroExpander::get(xComponentContext) ) {} |