diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2021-07-15 10:35:24 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2021-08-18 13:18:36 +0200 |
| commit | e34ec3e196b3265ea640e1730c7d42dd6182e65f (patch) | |
| tree | 61cb7a47b930745b85d317ee0c553248f50d8b09 /include/sfx2 | |
| parent | f926356e1f48a461eb3157c1020de0bd48f76080 (diff) | |
Don't crash on SidebarController dispose when app is closing
When app is closing it is possible SfxGetpApp() will return null. So
GetCurrentTheme() cannot return reference to correct theme.
Remember which theme has registered SidebarController to unregister when
disposing.
Change-Id: If223233f621601f445472b0413a56e9c51e59673
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118970
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120630
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/sidebar/SidebarController.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index 133c1f5806c6..3df8d8fb2e45 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -29,6 +29,7 @@ #include <sfx2/sidebar/TabBar.hxx> #include <sfx2/viewfrm.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> @@ -194,6 +195,7 @@ private: OUString msCurrentDeckId; AsynchronousCall maPropertyChangeForwarder; AsynchronousCall maContextChangeUpdate; + css::uno::Reference<css::beans::XPropertySet> mxThemePropertySet; /** Two flags control whether the deck is displayed or if only the tab bar remains visible. |