From 9b7a33125b3e0e35609a165910453d2954daf95a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 15 Jun 2016 17:10:03 +0100 Subject: Resolves: tdf#100140 crash on exit of report design This was triggered by This appears to be triggered by 08cf2fd01064306eef7fdbb5b62320947c4d1089 commit 08cf2fd01064306eef7fdbb5b62320947c4d1089 Author: Thorsten Behrens Date: Fri May 20 16:48:00 2016 +0200 which changed the order that things registered through registerDispatchProviderInterceptor are used by, so swap the order of registerDispatchProviderInterceptor calls here to sync with that Change-Id: I047e4c7f6cb488c646df717e22c8ac91864c3938 (cherry picked from commit 38971bd6543143df41192b0552c51a8119d452a0) --- embeddedobj/source/general/docholder.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'embeddedobj') diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index f8b46766037f..7dab0063a1c2 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -840,11 +840,11 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame() m_pInterceptor = new Interceptor( this ); m_pInterceptor->acquire(); + xInterception->registerDispatchProviderInterceptor( m_pInterceptor ); + // register interceptor from outside if ( m_xOutplaceInterceptor.is() ) xInterception->registerDispatchProviderInterceptor( m_xOutplaceInterceptor ); - - xInterception->registerDispatchProviderInterceptor( m_pInterceptor ); } uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( m_xFrame, uno::UNO_QUERY ); -- cgit