User: ihi Date: 2007-11-20 18:59:30+0000 Modified: dba/reportdesign/source/core/sdr/UndoActions.cxx
Log: INTEGRATION: CWS reportdesign01 (1.4.20); FILE MERGED 2007/10/05 11:52:04 oj 1.4.20.1: #i77604# impl method to add functions more simpler File Changes: Directory: /dba/reportdesign/source/core/sdr/ ============================================= File [changed]: UndoActions.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/sdr/UndoActions.cxx?r1=1.4&r2=1.5 Delta lines: +1 -1 ------------------- --- UndoActions.cxx 2007-08-03 12:44:17+0000 1.4 +++ UndoActions.cxx 2007-11-20 18:59:28+0000 1.5 @@ -158,7 +158,7 @@ #if OSL_DEBUG_LEVEL > 0 SvxShape* pShape = SvxShape::getImplementation( xChild ); SdrObject* pObject = pShape ? pShape->GetSdrObject() : NULL; - OSL_ENSURE( pShape && ( pObject ? pShape->HasSdrObjectOwnership() && !pObject->IsInserted() : true ), + OSL_ENSURE( pObject ? pShape->HasSdrObjectOwnership() && !pObject->IsInserted() : true , "OUndoContainerAction::~OUndoContainerAction: inconsistency in the shape/object ownership!" ); #endif // -> dispose it --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
