From 26ef3153f3cd35ff1198a48479facea1d97b8fcd Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Thu, 25 Apr 2013 16:51:49 +0200 Subject: fdo#62088: Fix crash on master page switch too. This is actually a regression caused by 1165aac95b8e44f41fc16a44bfec4c1c05801ac8, where a confusing code was removed, that should have stayed there. Re-introduced in a readable way. Change-Id: Ib99c19c04cf3b098097cef8da5da63b8cc7dd130 --- svx/source/form/fmpgeimp.cxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'svx') diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index ab7c9d597989..88e42ef86866 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -162,6 +162,9 @@ void FmFormPageImpl::initFrom( FmFormPageImpl& i_foreignImpl ) // clone the Forms collection const Reference< css::form::XForms > xForeignForms( const_cast< FmFormPageImpl& >( i_foreignImpl ).getForms( false ) ); + if ( !xForeignForms.is() ) + return; + try { m_xForms.set( xForeignForms->createClone(), UNO_QUERY_THROW ); -- cgit