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 /include | |
| 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 'include')
| -rw-r--r-- | include/sfx2/sidebar/SidebarController.hxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index 063a156bec06..db0a9a15bc7a 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -21,8 +21,6 @@ #include <sal/config.h> -#include <map> - #include <sfx2/sidebar/AsynchronousCall.hxx> #include <sfx2/sidebar/Context.hxx> #include <sfx2/sidebar/FocusManager.hxx> @@ -43,8 +41,6 @@ #include <boost/optional.hpp> #include <cppuhelper/compbase4.hxx> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/weakref.hxx> - namespace @@ -161,11 +157,6 @@ public: void notifyDeckTitle(const OUString& targetDeckId); private: - typedef ::std::map< - const css::uno::Reference<css::frame::XController>, - css::uno::WeakReference<SidebarController> - > SidebarControllerContainer; - static SidebarControllerContainer maSidebarControllerContainer; VclPtr<Deck> mpCurrentDeck; VclPtr<SidebarDockingWindow> mpParentWindow; |