diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-07-16 17:41:48 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-08-13 11:35:15 +0200 |
commit | 3184d57afcbcacdab26e0fa4fc564486ce66b38b (patch) | |
tree | ba111e2af2cfaec9f41b4216fd9c4d402db4e6e2 /sfx2 | |
parent | 6b2def18093055290cc896023078b639d85694f6 (diff) |
tdf#126424 Don't dispose decks before saving their state
Only dispose them in SidebarController::disposing after the
state has been saved.
Change-Id: I9e42383e20e2bc0100557b8cb8fbd26b3505f236
Reviewed-on: https://gerrit.libreoffice.org/75719
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/76602
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 0b3e8cbed671..5ed199f58f69 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -181,7 +181,6 @@ void SidebarController::registerSidebarForFrame(SidebarController* pController, void SidebarController::unregisterSidebarForFrame(SidebarController* pController, const css::uno::Reference<css::frame::XController>& xController) { - pController->disposeDecks(); css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer ( css::ui::ContextChangeEventMultiplexer::get( ::comphelper::getProcessComponentContext())); @@ -217,24 +216,7 @@ void SAL_CALL SidebarController::disposing() } // clear decks - ResourceManager::DeckContextDescriptorContainer aDecks; - - mpResourceManager->GetMatchingDecks ( - aDecks, - GetCurrentContext(), - IsDocumentReadOnly(), - mxFrame->getController()); - - for (ResourceManager::DeckContextDescriptorContainer::const_iterator - iDeck(aDecks.begin()), iEnd(aDecks.end()); - iDeck!=iEnd; ++iDeck) - { - std::shared_ptr<DeckDescriptor> deckDesc = mpResourceManager->GetDeckDescriptor(iDeck->msId); - - VclPtr<Deck> aDeck = deckDesc->mpDeck; - if (aDeck) - aDeck.disposeAndClear(); - } + disposeDecks(); uno::Reference<css::frame::XController> xController = mxFrame->getController(); if (!xController.is()) @@ -671,9 +653,6 @@ void SidebarController::SwitchToDeck ( const DeckDescriptor& rDeckDescriptor, const Context& rContext) { - - maFocusManager.Clear(); - const bool bForceNewDeck ((mnRequestedForceFlags&SwitchFlag_ForceNewDeck)!=0); const bool bForceNewPanels ((mnRequestedForceFlags&SwitchFlag_ForceNewPanels)!=0); mnRequestedForceFlags = SwitchFlag_NoForce; |