From ff3ced12f9fd7b81c66176c260b58e1452d7b26a Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Tue, 22 Feb 2005 07:21:49 +0000
Subject: INTEGRATION: CWS swqbugfixes14 (1.62.72); FILE MERGED 2005/02/03
 08:29:15 od 1.62.72.1: #119236# <SwXShape::dispose()> - no delete of frame
 format for drawing 	 objects, which are members of a group object.

---
 sw/source/core/unocore/unodraw.cxx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'sw/source/core')

diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 6c0fc23cddd2..9abf6b9b719f 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.62 $
+ *  $Revision: 1.63 $
  *
- *  last change: $Author: vg $ $Date: 2004-12-23 10:10:53 $
+ *  last change: $Author: vg $ $Date: 2005-02-22 08:21:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2021,14 +2021,22 @@ void SwXShape::dispose(void) throw( uno::RuntimeException )
         // <pObj> must be the same as <pFmt->FindSdrObject()>, if <pObj> isn't
         // a 'virtual' drawing object.
         // OD 25.08.2003 #111713# - refine assertion for safety reason.
+        // --> OD 2005-02-02 #119236# - correct assertion and refine it.
         ASSERT( !pObj ||
-                !pObj->ISA(SwDrawVirtObj) || pObj == pFmt->FindSdrObject(),
+                pObj->ISA(SwDrawVirtObj) ||
+                pObj->GetUpGroup() ||
+                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.
+        // --> OD 2005-02-02 #119236# - no delete of draw format for members
+        // of a group
         if ( pObj &&
              !pObj->ISA(SwDrawVirtObj) &&
+             !pObj->GetUpGroup() &&
              pObj->IsInserted() )
+        // <--
         {
             if( pFmt->GetAnchor().GetAnchorId() == FLY_IN_CNTNT )
             {
-- 
cgit v1.2.3