mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: tdf#100140 crash on exit of report design

Browse Source 
This was triggered by

This appears to be triggered by 08cf2fd010

commit 08cf2fd010
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
This commit is contained in:
Caolán McNamara
2016-06-15 17:10:03 +01:00
parent b4855bd63c
commit 38971bd654
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
embeddedobj/source/general/docholder.cxx
View File

@@ -840,11 +840,11 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame()
m_pInterceptor = new Interceptor( this ); m_pInterceptor = new Interceptor( this );
m_pInterceptor->acquire(); m_pInterceptor->acquire();
xInterception->registerDispatchProviderInterceptor( m_pInterceptor );
// register interceptor from outside // register interceptor from outside
if ( m_xOutplaceInterceptor.is() ) if ( m_xOutplaceInterceptor.is() )
xInterception->registerDispatchProviderInterceptor( m_xOutplaceInterceptor ); xInterception->registerDispatchProviderInterceptor( m_xOutplaceInterceptor );
xInterception->registerDispatchProviderInterceptor( m_pInterceptor );
} }
uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( m_xFrame, uno::UNO_QUERY ); uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( m_xFrame, uno::UNO_QUERY );