summaryrefslogtreecommitdiff
path: root/sw/source/core/unocore/unodraw.cxx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-05-22 07:43:55 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-05-22 07:43:55 +0000
commitc7d658ce140825b413f596d4fa2a75da569dc87b (patch)
tree9ba29677f9e84d155b242ffed32de03e7268f8a8 /sw/source/core/unocore/unodraw.cxx
parent5a2f3a013ea7957f7dad22829cc47c1856bd98bd (diff)
INTEGRATION: CWS os9 (1.44.18); FILE MERGED
2003/05/08 06:40:37 os 1.44.18.1: #109429# dispose: remove draw object only if it's still inserted
Diffstat (limited to 'sw/source/core/unocore/unodraw.cxx')
-rw-r--r--sw/source/core/unocore/unodraw.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 767ce3f0ed73..3b28214b4c65 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.47 $
+ * $Revision: 1.48 $
*
- * last change: $Author: os $ $Date: 2003-05-08 08:51:08 $
+ * last change: $Author: vg $ $Date: 2003-05-22 08:43:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1592,12 +1592,12 @@ void SwXShape::dispose(void) throw( RuntimeException )
if(pObj && pObj->IsInserted())
{
if( pFmt->GetAnchor().GetAnchorId() == FLY_IN_CNTNT )
- {
- const SwPosition &rPos = *(pFmt->GetAnchor().GetCntntAnchor());
- SwTxtNode *pTxtNode = rPos.nNode.GetNode().GetTxtNode();
- const xub_StrLen nIdx = rPos.nContent.GetIndex();
- pTxtNode->Delete( RES_TXTATR_FLYCNT, nIdx, nIdx );
- }
+ {
+ const SwPosition &rPos = *(pFmt->GetAnchor().GetCntntAnchor());
+ SwTxtNode *pTxtNode = rPos.nNode.GetNode().GetTxtNode();
+ const xub_StrLen nIdx = rPos.nContent.GetIndex();
+ pTxtNode->Delete( RES_TXTATR_FLYCNT, nIdx, nIdx );
+ }
else
pFmt->GetDoc()->DelLayoutFmt( pFmt );
}