mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

afl-eventtesting + VclPtr: only current context decks getting disposed

Browse Source 
but they all have to go, not just the current one

Change-Id: I84819c2a74042ad028fbdd8acba5d925c7fdedab
This commit is contained in:
Caolán McNamara
2015-10-21 10:45:07 +01:00
parent f7799477dd
commit 3303f43a6e
4 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/sfx2/sidebar/ResourceManager.hxx
View File

@@ -67,6 +67,7 @@ public:
void UpdateModel(css::uno::Reference<css::frame::XModel> xModel); void UpdateModel(css::uno::Reference<css::frame::XModel> xModel);
void disposeDecks();
class DeckContextDescriptor class DeckContextDescriptor
{ {

2
include/sfx2/sidebar/SidebarController.hxx
View File

@@ -160,7 +160,7 @@ public:
void updateModel(css::uno::Reference<css::frame::XModel> xModel); void updateModel(css::uno::Reference<css::frame::XModel> xModel);
void disposeDecks(css::uno::Reference<css::frame::XController> xController); void disposeDecks();
private: private:

9
sfx2/source/sidebar/ResourceManager.cxx
View File

@@ -649,7 +649,8 @@ bool ResourceManager::IsDeckEnabled (
void ResourceManager::UpdateModel(css::uno::Reference<css::frame::XModel> xModel) void ResourceManager::UpdateModel(css::uno::Reference<css::frame::XModel> xModel)
{ {
for (DeckContainer::iterator itr = maDecks.begin(); itr != maDecks.end(); ++itr) { for (DeckContainer::iterator itr = maDecks.begin(); itr != maDecks.end(); ++itr)
{
if (!itr->mpDeck) if (!itr->mpDeck)
continue; continue;
@@ -661,8 +662,12 @@ void ResourceManager::UpdateModel(css::uno::Reference<css::frame::XModel> xModel
} }
} }
}
void ResourceManager::disposeDecks()
{
for (DeckContainer::iterator itr = maDecks.begin(); itr != maDecks.end(); ++itr)
itr->mpDeck.disposeAndClear();
} }
} } // end of namespace sfx2::sidebar } } // end of namespace sfx2::sidebar

29
sfx2/source/sidebar/SidebarController.cxx
View File

@@ -174,7 +174,7 @@ void SidebarController::registerSidebarForFrame(SidebarController* pController,
void SidebarController::unregisterSidebarForFrame(SidebarController* pController, css::uno::Reference<css::frame::XController> xController) void SidebarController::unregisterSidebarForFrame(SidebarController* pController, css::uno::Reference<css::frame::XController> xController)
{ {
pController->disposeDecks(xController); pController->disposeDecks();
css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer ( css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
css::ui::ContextChangeEventMultiplexer::get( css::ui::ContextChangeEventMultiplexer::get(
::comphelper::getProcessComponentContext())); ::comphelper::getProcessComponentContext()));
@@ -184,34 +184,11 @@ void SidebarController::unregisterSidebarForFrame(SidebarController* pController
xController); xController);
} }
void SidebarController::disposeDecks(css::uno::Reference<css::frame::XController> xController) void SidebarController::disposeDecks()
{
// clear decks
ResourceManager::DeckContextDescriptorContainer aDecks;
mpResourceManager->GetMatchingDecks (
aDecks,
GetCurrentContext(),
IsDocumentReadOnly(),
xController);
for (ResourceManager::DeckContextDescriptorContainer::const_iterator
iDeck(aDecks.begin()), iEnd(aDecks.end());
iDeck!=iEnd; ++iDeck)
{
const DeckDescriptor* deckDesc = mpResourceManager->GetDeckDescriptor(iDeck->msId);
VclPtr<Deck> aDeck = deckDesc->mpDeck;
if (aDeck == mpCurrentDeck)
{ {
mpCurrentDeck.clear(); mpCurrentDeck.clear();
maFocusManager.Clear(); maFocusManager.Clear();
} mpResourceManager->disposeDecks();
if (aDeck)
{
aDeck.disposeAndClear();
mpResourceManager->SetDeckToDescriptor(iDeck->msId, VclPtr<Deck>());
}
}
} }
void SAL_CALL SidebarController::disposing() void SAL_CALL SidebarController::disposing()