diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-19 17:56:10 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-19 18:17:06 +0100 |
commit | c788c20fb235241624f3cab4698dfbdb20213608 (patch) | |
tree | f6957c039db6e39154907457f6e1cabd579047b9 /framework/inc | |
parent | 21228ee04042b87a2c9c971d564a8b56e74c120a (diff) |
Use SolarMutexGuard directly
Change-Id: Ib6effb226472e52ee90434e96d7fe446e9265cc2
Diffstat (limited to 'framework/inc')
-rw-r--r-- | framework/inc/uielement/statusbarmanager.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index a975753ad778..1b080be2edaf 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARMANAGER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARMANAGER_HXX -#include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -44,8 +43,7 @@ namespace framework { class FrameworkStatusBar; -class StatusBarManager : public ThreadHelpBase, - public ::cppu::WeakImplHelper3< +class StatusBarManager : public ::cppu::WeakImplHelper3< css::frame::XFrameActionListener, css::lang::XComponent, css::ui::XUIConfigurationListener > @@ -111,6 +109,7 @@ class StatusBarManager : public ThreadHelpBase, com::sun::star::uno::Reference< com::sun::star::frame::XFrame > m_xFrame; com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_xUICommandLabels; StatusBarControllerMap m_aControllerMap; + osl::Mutex m_mutex; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XUIControllerFactory > m_xStatusbarControllerFactory; |