summaryrefslogtreecommitdiff
path: root/sw/source/core/unocore/unodraw.cxx
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2003-10-30 09:21:59 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2003-10-30 09:21:59 +0000
commitd662c6a6d1aea63180f1f11152974cf2f0440547 (patch)
tree4839422e131dcb7e97143ae5c459da43369920a8 /sw/source/core/unocore/unodraw.cxx
parent88326f5106f017550b894f421551c30293725069 (diff)
INTEGRATION: CWS writerteamqbugs (1.50.68); FILE MERGED
2003/08/25 11:54:09 od 1.50.68.1: #111713# <SwXShape::dispose(..)> - refine assertion for safety reason.
Diffstat (limited to 'sw/source/core/unocore/unodraw.cxx')
-rw-r--r--sw/source/core/unocore/unodraw.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index ec74fa7f6443..0d5605ef8409 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unodraw.cxx,v $
*
- * $Revision: 1.50 $
+ * $Revision: 1.51 $
*
- * last change: $Author: vg $ $Date: 2003-07-11 12:23:40 $
+ * last change: $Author: rt $ $Date: 2003-10-30 10:21:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1607,7 +1607,9 @@ void SwXShape::dispose(void) throw( RuntimeException )
// OD 10.07.2003 #110742# - safety assertion:
// <pObj> must be the same as <pFmt->FindSdrObject()>, if <pObj> isn't
// a 'virtual' drawing object.
- ASSERT( !pObj->ISA(SwDrawVirtObj) || pObj == pFmt->FindSdrObject(),
+ // OD 25.08.2003 #111713# - refine assertion for safety reason.
+ ASSERT( !pObj ||
+ !pObj->ISA(SwDrawVirtObj) || pObj == pFmt->FindSdrObject(),
"<SwXShape::dispose(..) - different 'master' drawing objects!!" );
// OD 10.07.2003 #110742# - perform delete of draw frame format *not*
// for 'virtual' drawing objects.