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

framework: call disposing from disposing, not notifyTermination

Browse Source 
Don't rely on current implementation details of TerminateListener.

Change-Id: I7977c73669f0ab5afac1c93be620e7aeebfe68a2
This commit is contained in:
Michael Stahl
2017-01-11 20:35:15 +01:00
parent 9334de4f6d
commit 7d0e3b32de
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/source/services/desktop.cxx
View File

@@ -1121,11 +1121,11 @@ void SAL_CALL Desktop::disposing()
m_xStarBasicQuitGuard.clear(); m_xStarBasicQuitGuard.clear();
m_xSWThreadManager.clear(); m_xSWThreadManager.clear();
// we need a copy because the notifyTermination might call the removeEventListener method // we need a copy because the disposing might call the removeEventListener method
std::vector< css::uno::Reference<css::frame::XTerminateListener> > xComponentDllListeners = m_xComponentDllListeners; std::vector< css::uno::Reference<css::frame::XTerminateListener> > xComponentDllListeners = m_xComponentDllListeners;
for (auto& xListener: xComponentDllListeners) for (auto& xListener: xComponentDllListeners)
{ {
xListener->notifyTermination(aEvent); xListener->disposing(aEvent);
} }
xComponentDllListeners.clear(); xComponentDllListeners.clear();
m_xComponentDllListeners.clear(); m_xComponentDllListeners.clear();