diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-10-08 19:14:35 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-10-09 20:42:11 +0200 |
commit | 33972dea7d8849842929060be8f970e090077e4c (patch) | |
tree | b491d8ff51cf52b26177778a161142d61764426b /include/sfx2 | |
parent | c129a415ad0998b1544aed756316ed869148ef7b (diff) |
correctly dispose the chart sidebar when leaving chart, tdf#94292
This is a much better approach than my old one that tried to use the
correct XModel with the chart sidebar. Now everytime we leave the chart
edit mdoe we destroy the chart sidebar panels and recreate them when we
go back to chart edit mode.
As a result we no longer need to have worry that much about using the
correct ChartModel and about the lifecycle of the ChartModel.
Change-Id: Ie85ad82968e20a81f059d4bd930a83a70da35fc9
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 0c88901282d9..64bc26ea431f 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -160,6 +160,8 @@ public: void updateModel(css::uno::Reference<css::frame::XModel> xModel); + void disposeDecks(css::uno::Reference<css::frame::XController> xController); + private: VclPtr<Deck> mpCurrentDeck; |