diff options
| author | Marcel Metz <mmetz@adrian-broher.net> | 2012-01-15 11:30:24 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-01-23 23:28:46 +0100 |
| commit | f9e6d195dbbf0b2effa10f69f4c99fce6e2b186b (patch) | |
| tree | d79d0e06993af15e44c7b00c94cbc1d6fac470b2 /svx | |
| parent | e384f241554a1157137b6121a064f75308b2ba10 (diff) | |
Replaced diagnore ENSURE_OR_BREAK with regular code.
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmpgeimp.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index b71ed1c0f710..a0374016bf44 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -204,8 +204,12 @@ void FmFormPageImpl::initFrom( FmFormPageImpl& i_foreignImpl ) bool bForeignIsForm = pForeignObj && ( pForeignObj->GetObjInventor() == FmFormInventor ); bool bOwnIsForm = pOwnObj && ( pOwnObj->GetObjInventor() == FmFormInventor ); - ENSURE_OR_BREAK( bForeignIsForm == bOwnIsForm, "FmFormPageImpl::FmFormPageImpl: inconsistent ordering of objects!" ); + if ( bForeignIsForm != bOwnIsForm ) + { // if this fires, don't attempt to do further assignments, something's completely messed up + SAL_WARN( "svx.form", "FmFormPageImpl::FmFormPageImpl: inconsistent ordering of objects!" ); + break; + } if ( !bForeignIsForm ) // no form control -> next round |