summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2013-04-25 16:51:49 +0200
committerJan Holesovsky <kendy@suse.cz>2013-04-25 16:55:10 +0200
commit26ef3153f3cd35ff1198a48479facea1d97b8fcd (patch)
tree052bb22d0789a376101a594edb2b7e8aaf7fe0b9
parent21fb092398fb21256b0e546e7f38c5e6de4654f2 (diff)
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
-rw-r--r--svx/source/form/fmpgeimp.cxx3
1 files changed, 3 insertions, 0 deletions
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 );