summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-06-30 23:23:36 +0200
committerMichael Meeks <michael.meeks@collabora.com>2017-07-04 13:08:01 +0200
commitdb85aebb7119181f9d96385006e52384c5457600 (patch)
treeb666ccaad1ce06a4cedd1c711db6df4c5bf14d93 /framework
parent893c6e4007da093d2e954b5a0cb847f8d3d65d66 (diff)
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 <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 7250bc4721b334714bb0fa1345211c83330f94b2) Reviewed-on: https://gerrit.libreoffice.org/39489 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/services/desktop.hxx9
-rw-r--r--framework/source/services/desktop.cxx44
2 files changed, 53 insertions, 0 deletions
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 609419c322d4..e003d3e8276a 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -346,6 +346,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 1791e857f4ec..2f3608f1b894 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -325,6 +325,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;
@@ -1646,6 +1650,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<css::frame::XTerminateListener>::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 );