1 files changed, 18 insertions, 19 deletions

diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index 54ed7ea8421d..2c09ff4f3da6 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -32,15 +32,9 @@
 #include "precompiled_sw.hxx"
 
 #include <rtl/string.h>
-
-#ifndef _RTL_MEMORY_H
 #include <rtl/memory.h>
-#endif
 #include <hintids.hxx>
 
-#ifndef _RTL_STRING_H
-#include <rtl/string.h>
-#endif
 #include <svx/svdogrp.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdpage.hxx>
@@ -61,6 +55,7 @@
 #include <rootfrm.hxx>
 #include <viewsh.hxx>
 
+
 struct SwUndoGroupObjImpl
 {
     SwDrawFrmFmt* pFmt;
@@ -142,15 +137,15 @@ void lcl_SendRemoveToUno( SwFmt& rFmt )
 void lcl_SaveAnchor( SwFrmFmt* pFmt, ULONG& rNodePos )
 {
     const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
-    if( FLY_AT_CNTNT == rAnchor.GetAnchorId() ||
-        FLY_AUTO_CNTNT == rAnchor.GetAnchorId() ||
-        FLY_AT_FLY == rAnchor.GetAnchorId() ||
-        FLY_IN_CNTNT == rAnchor.GetAnchorId() )
+    if ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
+        (FLY_AT_CHAR == rAnchor.GetAnchorId()) ||
+        (FLY_AT_FLY  == rAnchor.GetAnchorId()) ||
+        (FLY_AS_CHAR == rAnchor.GetAnchorId()))
     {
         rNodePos = rAnchor.GetCntntAnchor()->nNode.GetIndex();
         xub_StrLen nCntntPos = 0;
 
-        if( FLY_IN_CNTNT == rAnchor.GetAnchorId() )
+        if (FLY_AS_CHAR == rAnchor.GetAnchorId())
         {
             nCntntPos = rAnchor.GetCntntAnchor()->nContent.GetIndex();
 
@@ -168,8 +163,10 @@ void lcl_SaveAnchor( SwFrmFmt* pFmt, ULONG& rNodePos )
                 pTxtNd->EraseText( aIdx, 1 );
             }
         }
-        else if( FLY_AUTO_CNTNT == rAnchor.GetAnchorId() )
+        else if (FLY_AT_CHAR == rAnchor.GetAnchorId())
+        {
             nCntntPos = rAnchor.GetCntntAnchor()->nContent.GetIndex();
+        }
 
         pFmt->SetFmtAttr( SwFmtAnchor( rAnchor.GetAnchorId(), nCntntPos ) );
     }
@@ -178,10 +175,10 @@ void lcl_SaveAnchor( SwFrmFmt* pFmt, ULONG& rNodePos )
 void lcl_RestoreAnchor( SwFrmFmt* pFmt, ULONG& rNodePos )
 {
     const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
-    if( FLY_AT_CNTNT == rAnchor.GetAnchorId() ||
-        FLY_AUTO_CNTNT == rAnchor.GetAnchorId() ||
-        FLY_AT_FLY == rAnchor.GetAnchorId() ||
-        FLY_IN_CNTNT == rAnchor.GetAnchorId() )
+    if ((FLY_AT_PARA == rAnchor.GetAnchorId()) ||
+        (FLY_AT_CHAR == rAnchor.GetAnchorId()) ||
+        (FLY_AT_FLY  == rAnchor.GetAnchorId()) ||
+        (FLY_AS_CHAR == rAnchor.GetAnchorId()))
     {
         xub_StrLen nCntntPos = rAnchor.GetPageNum();
         SwNodes& rNds = pFmt->GetDoc()->GetNodes();
@@ -190,13 +187,15 @@ void lcl_RestoreAnchor( SwFrmFmt* pFmt, ULONG& rNodePos )
         SwPosition aPos( aIdx );
 
         SwFmtAnchor aTmp( rAnchor.GetAnchorId() );
-        if( FLY_IN_CNTNT == rAnchor.GetAnchorId() ||
-            FLY_AUTO_CNTNT == rAnchor.GetAnchorId() )
+        if ((FLY_AS_CHAR == rAnchor.GetAnchorId()) ||
+            (FLY_AT_CHAR == rAnchor.GetAnchorId()))
+        {
             aPos.nContent.Assign( aIdx.GetNode().GetCntntNode(), nCntntPos );
+        }
         aTmp.SetAnchor( &aPos );
         pFmt->SetFmtAttr( aTmp );
 
-        if( FLY_IN_CNTNT == rAnchor.GetAnchorId() )
+        if (FLY_AS_CHAR == rAnchor.GetAnchorId())
         {
             SwTxtNode *pTxtNd = aIdx.GetNode().GetTxtNode();
             ASSERT( pTxtNd, "no Text Node" );