diff options
Diffstat (limited to 'desktop/source/deployment/manager/dp_managerfac.cxx')
| -rw-r--r-- | desktop/source/deployment/manager/dp_managerfac.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index ada9a9c3a9e5..79e0ea3588db 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -19,6 +19,7 @@ #include "dp_manager.h" +#include <dp_misc.h> #include <cppuhelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/deployment/XPackageManagerFactory.hpp> @@ -36,7 +37,7 @@ typedef ::cppu::WeakComponentImplHelper< namespace { -class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper +class PackageManagerFactoryImpl : private cppu::BaseMutex, public t_pmfac_helper { Reference<XComponentContext> m_xComponentContext; @@ -71,7 +72,7 @@ public: PackageManagerFactoryImpl::PackageManagerFactoryImpl( Reference<XComponentContext> const & xComponentContext ) - : t_pmfac_helper( getMutex() ), + : t_pmfac_helper( m_aMutex ), m_xComponentContext( xComponentContext ) { } @@ -95,7 +96,7 @@ css::uno::Sequence< OUString > PackageManagerFactoryImpl::getSupportedServiceNam inline void PackageManagerFactoryImpl::check() { - ::osl::MutexGuard guard( getMutex() ); + ::osl::MutexGuard guard( m_aMutex ); if (rBHelper.bInDispose || rBHelper.bDisposed) { throw lang::DisposedException( @@ -108,7 +109,7 @@ inline void PackageManagerFactoryImpl::check() void PackageManagerFactoryImpl::disposing() { // dispose all managers: - ::osl::MutexGuard guard( getMutex() ); + ::osl::MutexGuard guard( m_aMutex ); for (auto const& elem : m_managers) try_dispose( elem.second ); m_managers = t_string2weakref(); @@ -126,7 +127,7 @@ Reference<deployment::XPackageManager> PackageManagerFactoryImpl::getPackageManager( OUString const & context ) { Reference< deployment::XPackageManager > xRet; - ::osl::ResettableMutexGuard guard( getMutex() ); + ::osl::ResettableMutexGuard guard( m_aMutex ); check(); t_string2weakref::const_iterator const iFind( m_managers.find( context ) ); if (iFind != m_managers.end()) { |