diff options
| -rw-r--r-- | framework/inc/uielement/uicommanddescription.hxx | 3 | ||||
| -rw-r--r-- | framework/source/uielement/uicommanddescription.cxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx index 451a60d9d8b1..46640b28cfe1 100644 --- a/framework/inc/uielement/uicommanddescription.hxx +++ b/framework/inc/uielement/uicommanddescription.hxx @@ -29,6 +29,7 @@ #include <com/sun/star/frame/XModuleManager2.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase2.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ustring.hxx> @@ -38,7 +39,7 @@ namespace framework typedef ::cppu::WeakComponentImplHelper2< com::sun::star::lang::XServiceInfo, com::sun::star::container::XNameAccess > UICommandDescription_BASE; -class UICommandDescription : private osl::Mutex, +class UICommandDescription : private cppu::BaseMutex, public UICommandDescription_BASE { public: diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 387dec6db1c2..5d72c5f366c7 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -603,7 +603,7 @@ void SAL_CALL ConfigurationAccess_UICommand::disposing( const EventObject& aEven } UICommandDescription::UICommandDescription( const Reference< XComponentContext >& rxContext ) : - UICommandDescription_BASE(*static_cast<osl::Mutex *>(this)), + UICommandDescription_BASE(m_aMutex), m_aPrivateResourceURL( PRIVATE_RESOURCE_URL ), m_xContext( rxContext ) { @@ -619,7 +619,7 @@ UICommandDescription::UICommandDescription( const Reference< XComponentContext > pIter->second = m_xGenericUICommands; } UICommandDescription::UICommandDescription(const Reference< XComponentContext >& rxContext, bool) - : UICommandDescription_BASE(*static_cast<osl::Mutex *>(this)) + : UICommandDescription_BASE(m_aMutex) , m_bConfigRead(false) , m_xContext(rxContext) { |