From 7250bc4721b334714bb0fa1345211c83330f94b2 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 30 Jun 2017 23:23:36 +0200 Subject: notify the clipboard terminate listener before any other terminate listener Otherwise we may have destroyed a service that is needed to generate one of the clipboard formats requested by the system clipboard. Change-Id: Id05de3ac569e3ed38cd97efc4c48326bc6a8db0b Reviewed-on: https://gerrit.libreoffice.org/39429 Tested-by: Jenkins Reviewed-by: Markus Mohrhard --- framework/inc/services/desktop.hxx | 9 +++++++ framework/source/services/desktop.cxx | 44 +++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) (limited to 'framework') diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 2b07a2487d97..a77c816e9d2a 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -341,6 +341,15 @@ class Desktop : private cppu::BaseMutex, */ void impl_sendCancelTerminationEvent(const TTerminateListenerList& lCalledListener); + /** calls notifyTermination() on the clipboard listener + * + * The system clipboard may decide that it wants copies + * in several formats of the clipboard content requiring + * nearly all the services + * + */ + void impl_sendTerminateToClipboard(); + /** calls notifyTermination() on every registered termination listener. * * Note: Only normal termination listener (registered in list m_aListenerContainer diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 7c3c2e4b80d1..e96224815441 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -324,6 +324,10 @@ sal_Bool SAL_CALL Desktop::terminate() aWriteLock.clear(); /* UNSAFE AREA ------------------------------------------------------------------------------------- */ + // The clipboard listener needs to be the first. It can create copies of the + // existing document which needs basically all the available infrastructure. + impl_sendTerminateToClipboard(); + impl_sendNotifyTerminationEvent(); { SolarMutexGuard aGuard; @@ -1630,6 +1634,46 @@ void Desktop::impl_sendCancelTerminationEvent(const Desktop::TTerminateListenerL } } +void Desktop::impl_sendTerminateToClipboard() +{ + TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); + + ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType::get()); + if ( ! pContainer ) + return; + + ::cppu::OInterfaceIteratorHelper aIterator( *pContainer ); + while ( aIterator.hasMoreElements() ) + { + try + { + css::uno::Reference< css::lang::XServiceInfo > xInfo( aIterator.next(), css::uno::UNO_QUERY ); + if ( !xInfo.is() ) + continue; + + if ( xInfo->getImplementationName() != "com.sun.star.comp.svt.TransferableHelperTerminateListener" ) + continue; + + css::uno::Reference< css::frame::XTerminateListener > xListener(xInfo, css::uno::UNO_QUERY); + if ( ! xListener.is() ) + continue; + + css::lang::EventObject aEvent( static_cast< ::cppu::OWeakObject* >(this) ); + xListener->notifyTermination( aEvent ); + + // don't notify twice + aIterator.remove(); + } + catch( const css::uno::Exception& ) + { + // clean up container. + // E.g. dead remote listener objects can make trouble otherwise. + // Iterator implementation allows removing objects during it's used ! + aIterator.remove(); + } + } +} + void Desktop::impl_sendNotifyTerminationEvent() { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); -- cgit