diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-01-17 14:42:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-17 18:39:46 +0100 |
| commit | e579e4998389a06c04b550c7e70495b31a9a92d1 (patch) | |
| tree | 61e45c4817c34d9332b87d0d25317741cec350bc /framework | |
| parent | 0fee5b6618c158e7f2f142e2d96f21cf86dae9d8 (diff) | |
m_aListenerContainer is effectively unused here
ever since initial commit
Change-Id: Ia4cde1696edd26b8ddac3d093e043064d1cf87d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86976
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/dispatch/popupmenudispatcher.hxx | 4 | ||||
| -rw-r--r-- | framework/source/dispatch/popupmenudispatcher.cxx | 17 |
2 files changed, 4 insertions, 17 deletions
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index c383d015629d..929350853408 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -39,9 +39,6 @@ namespace framework{ -typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString> - IMPL_ListenerHashContainer; - /*-************************************************************************************************************ @short helper for desktop only(!) to create new tasks on demand for dispatches @descr Use this class as member only! Never use it as baseclass. @@ -115,7 +112,6 @@ class PopupMenuDispatcher final : public ::cppu::WeakImplHelper< 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 bool m_bAlreadyDisposed; /// Protection against multiple disposing calls. bool m_bActivateListener; /// dispatcher is listener for frame activation diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index 94ba14418118..caa3170c53bd 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -47,7 +47,6 @@ using namespace ::osl; PopupMenuDispatcher::PopupMenuDispatcher( const uno::Reference< XComponentContext >& xContext ) : m_xContext ( xContext ) - , m_aListenerContainer ( m_mutex ) , m_bAlreadyDisposed ( false ) , m_bActivateListener ( false ) { @@ -224,22 +223,14 @@ void SAL_CALL PopupMenuDispatcher::dispatch( const URL& /*aURL*/, const Sequence { } -void SAL_CALL PopupMenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) +void SAL_CALL PopupMenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& /*xControl*/, + const URL& /*aURL*/ ) { - SolarMutexGuard g; - // Safe impossible cases - // Add listener to container. - m_aListenerContainer.addInterface( aURL.Complete, xControl ); } -void SAL_CALL PopupMenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) +void SAL_CALL PopupMenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& /*xControl*/, + const URL& /*aURL*/ ) { - SolarMutexGuard g; - // Safe impossible cases - // Add listener to container. - m_aListenerContainer.removeInterface( aURL.Complete, xControl ); } void SAL_CALL PopupMenuDispatcher::frameAction( const FrameActionEvent& aEvent ) |