diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 09:34:52 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 09:43:18 +0100 |
| commit | 31052b36be1dbf39263ecf23496a5c041a805884 (patch) | |
| tree | 3a6daafd71e185807c3e21829c94929c3d891580 /framework/inc/dispatch | |
| parent | c63f42e26ac61ef776fc7aa125d695f742358dc4 (diff) | |
Use SolarMutexGuard directly
Change-Id: I2ae1a43862754030f88df033551c93fdbeeab14a
Diffstat (limited to 'framework/inc/dispatch')
| -rw-r--r-- | framework/inc/dispatch/popupmenudispatcher.hxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 8b58855574e5..4a0ed092a5af 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -23,7 +23,6 @@ #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> -#include <threadhelp/threadhelpbase.hxx> #include <general.h> #include <stdtypes.h> @@ -69,16 +68,11 @@ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString , XLoadEventListener XFrameActionListener XEventListener - @base ThreadHelpBase - OWeakObject + @base OWeakObject @devstatus ready to use *//*-*************************************************************************************************************/ -class PopupMenuDispatcher : // baseclasses - // Order is necessary for right initialization! - public ThreadHelpBase , - // interfaces - public ::cppu::WeakImplHelper5< +class PopupMenuDispatcher : public ::cppu::WeakImplHelper5< css::lang::XServiceInfo, css::frame::XDispatchProvider, css::frame::XDispatch, @@ -142,6 +136,7 @@ class PopupMenuDispatcher : // baseclasses css::uno::Reference< css::container::XNameAccess > m_xPopupCtrlQuery ; /// reference to query for popup controller css::uno::Reference< css::uri::XUriReferenceFactory > m_xUriRefFactory ; /// reference to the uri reference factory css::uno::Reference< css::uno::XComponentContext > m_xContext ; /// factory shared with our owner to create new services! + osl::Mutex m_mutex; IMPL_ListenerHashContainer m_aListenerContainer; /// hash table for listener at specified URLs sal_Bool m_bAlreadyDisposed ; /// Protection against multiple disposing calls. sal_Bool m_bActivateListener ; /// dispatcher is listener for frame activation |