diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-13 18:54:17 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-14 11:50:44 +0200 |
| commit | 9be8c4f21200aeec5b334d9536b3b7a0b72c24fa (patch) | |
| tree | 43df9f096d1c16a397e56460d458406d1b9cece3 /framework/source/fwe | |
| parent | a792aa2c48490e43f7460c7418048d32dc891a62 (diff) | |
sfx2: remove the global SidebarController::maSidebarControllerContainer
This global was crashing on exit, unsurprising as it contains UNO
services that reference VCL objects.
It turns out that there is already a UNO singleton
framework::ContextChangeEventMultiplexer that effectively contains this
mapping already, so try to hook that up without creating a public API of
it, which is made quite a bit harder by framework's inexplicable
multitude of libraries.
Change-Id: I4baf67b42c630191fa8879d650eeb62520c331a5
Diffstat (limited to 'framework/source/fwe')
| -rw-r--r-- | framework/source/fwe/classes/sfxhelperfunctions.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx index a1f0826a23f8..c04105ce2f5d 100644 --- a/framework/source/fwe/classes/sfxhelperfunctions.cxx +++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx @@ -18,6 +18,8 @@ */ #include <framework/sfxhelperfunctions.hxx> +#include <framework/ContextChangeEventMultiplexerTunnel.hxx> +#include <helper/mischelper.hxx> #include <tools/diagnose_ex.h> @@ -163,6 +165,14 @@ void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com:: (*pActivator)( i_rFrame, i_rPanelURL ); } +using namespace ::com::sun::star; +uno::Reference<ui::XContextChangeEventListener> GetFirstListenerWith( + uno::Reference<uno::XInterface> const& xEventFocus, + std::function<bool (uno::Reference<ui::XContextChangeEventListener> const&)> const& rPredicate) +{ + return GetFirstListenerWith_Impl(xEventFocus, rPredicate); +} + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |