diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-06-15 17:10:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-15 17:31:49 +0100 |
| commit | 9b7a33125b3e0e35609a165910453d2954daf95a (patch) | |
| tree | 9b338b2512d0898dd820eab604a763164a420477 /embeddedobj | |
| parent | c8e75854bf98c01b5762734cb6bbc9e56f0d15df (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
(cherry picked from commit 38971bd6543143df41192b0552c51a8119d452a0)
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/general/docholder.cxx | 4 |
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 ); |