summaryrefslogtreecommitdiff
path: root/embeddedobj
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-06-15 17:10:03 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-06-15 17:30:29 +0100
commit38971bd6543143df41192b0552c51a8119d452a0 (patch)
tree17a733ad621a97062b78d1f693cd430d051e9bc3 /embeddedobj
parentb4855bd63c05096df1a2da339133f243bb30d902 (diff)
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 <Thorsten.Behrens@CIB.de> 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
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/source/general/docholder.cxx4
1 files changed, 2 insertions, 2 deletions
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 );