strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impress61 (1.70.136); FILE MERGED

Browse source 
2005/06/27 15:11:54 cl 1.70.136.1: #120379# check for disposed page when creating a xshape
This commit is contained in:
Kurt Zenker 2005-07-14 09:45:40 +00:00
parent 79be3d71d9
commit ac5731e442
1 changed files with 104 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sd/source/ui/unoidl/unopage.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: unopage.cxx,v $
*
* $Revision: 1.70 $
* $Revision: 1.71 $
*
* last change: $Author: vg $ $Date: 2005-02-16 17:02:21 $
* last change: $Author: kz $ $Date: 2005-07-14 10:45:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1180,6 +1180,11 @@ void SAL_CALL SdGenericDrawPage::removeVetoableChangeListener( const OUString& P
Reference< drawing::XShape > SdGenericDrawPage::_CreateShape( SdrObject *pObj ) const throw()
{
DBG_ASSERT( GetPage(), "SdGenericDrawPage::_CreateShape(), can't create shape for disposed page!" );
DBG_ASSERT( pObj, "SdGenericDrawPage::_CreateShape(), invalid call with pObj == 0!" );
if( GetPage() && pObj )
{
PresObjKind eKind = GetPage()->GetPresObjKind(pObj);
SvxShape* pShape = NULL;
@ -1280,6 +1285,12 @@ Reference< drawing::XShape > SdGenericDrawPage::_CreateShape( SdrObject *pObj )
// SdXShape aggregiert SvxShape
new SdXShape( SvxShape::getImplementation( xShape ), mpModel );
return xShape;
}
else
{
return SvxFmDrawPage::_CreateShape( pObj );
}
}
//----------------------------------------------------------------------