1 files changed, 10 insertions, 10 deletions

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index e1c5b2509228..f8f6303e81e9 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -58,9 +58,7 @@
 #include <svx/adjitem.hxx>
 #include <svx/wghtitem.hxx>
 #include <svx/crsditem.hxx>
-#ifndef _SVX_CNTRITEM_HXX
 #include <svx/cntritem.hxx>
-#endif
 #include <svx/shdditem.hxx>
 #include <svx/fontitem.hxx>
 #include <svx/ulspitem.hxx>
@@ -191,13 +189,13 @@ bool SwWW8ImplReader::ReadGrafStart(void* pData, short nDataSiz,
     }
     pStrm->Read(pData, nDataSiz);
 
-    RndStdIds eAnchor = (SVBT8ToByte(pDo->by) < 2) ? FLY_PAGE : FLY_AT_CNTNT;
+    RndStdIds eAnchor = (SVBT8ToByte(pDo->by) < 2) ? FLY_AT_PAGE : FLY_AT_PARA;
     rSet.Put(SwFmtAnchor(eAnchor));
 
     nDrawXOfs2 = nDrawXOfs;
     nDrawYOfs2 = nDrawYOfs;
 
-    if( eAnchor == FLY_AT_CNTNT )
+    if (eAnchor == FLY_AT_PARA)
     {
         if( SVBT8ToByte( pDo->bx ) == 1 )       // Pos: echt links
             nDrawXOfs2 = static_cast< short >(nDrawXOfs2 - maSectionManager.GetPageLeft());
@@ -2248,7 +2246,7 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
 {
     ASSERT(pRecord || pFSPA, "give me something! to work with for anchoring");
     if (!pRecord && !pFSPA)
-        return FLY_PAGE;
+        return FLY_AT_PAGE;
 
     SvxMSDffImportRec aRecordFromFSPA;
     if (!pRecord)
@@ -2299,7 +2297,7 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
     UINT32 nYRelTo = nCntRelTo > pRecord->nYRelTo ? pRecord->nYRelTo : 1;
 
     // --> OD 2005-03-03 #i43718#
-    RndStdIds eAnchor = IsInlineEscherHack() ? FLY_IN_CNTNT : FLY_AUTO_CNTNT;
+    RndStdIds eAnchor = IsInlineEscherHack() ? FLY_AS_CHAR : FLY_AT_CHAR;
     // <--
 
     SwFmtAnchor aAnchor( eAnchor );
@@ -2463,7 +2461,7 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
 
         if (
             (pFSPA->nYaTop < 0) && (eVertOri == text::VertOrientation::NONE) &&
-            ((eAnchor == FLY_AT_CNTNT) || (eAnchor == FLY_AUTO_CNTNT))
+            ((eAnchor == FLY_AT_PARA) || (eAnchor == FLY_AT_CHAR))
            )
         {
             maTracer.Log(sw::log::eNegativeVertPlacement);
@@ -2846,7 +2844,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
 
 SwFrmFmt *SwWW8ImplReader::AddAutoAnchor(SwFrmFmt *pFmt)
 {
-    if (pFmt && (pFmt->GetAnchor().GetAnchorId() != FLY_IN_CNTNT))
+    if (pFmt && (pFmt->GetAnchor().GetAnchorId() != FLY_AS_CHAR))
     {
         sal_uInt16 nTextAreaWidth = static_cast< sal_uInt16 >( maSectionManager.GetPageWidth() -
             maSectionManager.GetPageRight() - maSectionManager.GetPageLeft());
@@ -2861,8 +2859,10 @@ SwFrmFmt *SwWW8ImplReader::AddAutoAnchor(SwFrmFmt *pFmt)
      *
      * Leave to later and set the correct location then.
      */
-    if ((pFmt) && (pFmt->GetAnchor().GetAnchorId() != FLY_IN_CNTNT))
+    if ((pFmt) && (pFmt->GetAnchor().GetAnchorId() != FLY_AS_CHAR))
+    {
         pAnchorStck->AddAnchor(*pPaM->GetPoint(), pFmt);
+    }
     return pFmt;
 }
 
@@ -3235,7 +3235,7 @@ void SwWW8ImplReader::GrafikDtor()
 
 void SwWW8FltAnchorStack::AddAnchor(const SwPosition& rPos, SwFrmFmt *pFmt)
 {
-    ASSERT(pFmt->GetAnchor().GetAnchorId() != FLY_IN_CNTNT,
+    ASSERT(pFmt->GetAnchor().GetAnchorId() != FLY_AS_CHAR,
         "Don't use fltanchors with inline frames, slap!");
     NewAttr(rPos, SwFltAnchor(pFmt));
 }