5 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 75b489ec59ea..5aa8bb75fe51 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -1084,10 +1084,10 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, bool bWeb )
         const SwFormatVertOrient& aVert( aSet.Get(RES_VERT_ORIENT) );
         const bool bFollowTextFlow =
                 aSet.Get(RES_FOLLOW_TEXT_FLOW).GetValue();
-        const SwPosition* pToCharContentPos = aSet.Get(RES_ANCHOR).GetContentAnchor();
+        const SwFormatAnchor& rFormatAnchor = aSet.Get(RES_ANCHOR);
         rSh.CalcBoundRect( aBoundRect, eAnchorId,
                            text::RelOrientation::FRAME, aVert.GetRelationOrient(),
-                           pToCharContentPos, bFollowTextFlow,
+                           &rFormatAnchor, bFollowTextFlow,
                            false, &aRefPoint );
     }
     tools::Long nLeft = std::min( aTmp.Left() - aBoundRect.Left(), aSnap.Width() );
@@ -6569,11 +6569,11 @@ bool SwEditWin::IsOverHeaderFooterFly( const Point& rDocPos, FrameControlType& r
         SwFrameFormat* pFlyFormat = pStartFly->GetFlyFormat( );
         if ( pFlyFormat )
         {
-            const SwPosition* pAnchor = pFlyFormat->GetAnchor( ).GetContentAnchor( );
-            if ( pAnchor )
+            const SwNode* pAnchorNode = pFlyFormat->GetAnchor( ).GetAnchorNode( );
+            if ( pAnchorNode )
             {
-                bool bInHeader = pAnchor->GetNode( ).FindHeaderStartNode( ) != nullptr;
-                bool bInFooter = pAnchor->GetNode( ).FindFooterStartNode( ) != nullptr;
+                bool bInHeader = pAnchorNode->FindHeaderStartNode( ) != nullptr;
+                bool bInFooter = pAnchorNode->FindFooterStartNode( ) != nullptr;
 
                 bRet = bInHeader || bInFooter;
                 if ( bInHeader )
diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx
index e6d788f0e6c9..d135f5f2d24b 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -261,7 +261,7 @@ void SwFlyFrameAttrMgr::SetAbsPos( const Point& rPoint )
 
 // check metrics for correctness
 void SwFlyFrameAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
-        const SwPosition* pToCharContentPos,
+        const SwFormatAnchor* pToCharContentPos,
         bool bOnlyPercentRefValue )
 {
     if (!bOnlyPercentRefValue)
diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx
index 9368766e43a3..c5ac8eba3edd 100644
--- a/sw/source/uibase/inc/frmmgr.hxx
+++ b/sw/source/uibase/inc/frmmgr.hxx
@@ -115,7 +115,7 @@ public:
 
     // check and change metrics
     void                ValidateMetrics(SvxSwFrameValidation& rVal,
-                            const SwPosition* pToCharContentPos,
+                            const SwFormatAnchor* pToCharContentPos,
                             bool bOnlyPercentRefValue = false);
 
     void                DelAttr(sal_uInt16 nId);
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index f6da2b115c89..2f816348332c 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -57,7 +57,7 @@ class SwFramePage final : public SfxTabPage
 
     // OD 12.11.2003 #i22341# - keep content position of character for
     // to character anchored objects.
-    const SwPosition* mpToCharContentPos;
+    const SwFormatAnchor* mpToCharContentPos;
 
     // old alignment
     sal_Int16 m_nOldH;
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 71c66a046e7d..9606f9c0551c 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -1052,20 +1052,20 @@ IMPL_LINK(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation&, rValidation,
     // OD 18.09.2003 #i18732# - adjustment for allowing vertical position
     //      aligned to page for fly frame anchored to paragraph or to character.
     const RndStdIds eAnchorType = rValidation.nAnchorType;
-    const SwPosition* pContentPos = nullptr;
+    const SwFormatAnchor* pAnchor = nullptr;
     SdrView*  pSdrView = pSh->GetDrawView();
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     if( rMarkList.GetMarkCount() == 1 )
     {
         SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
         SwFrameFormat* pFrameFormat = FindFrameFormat( pObj );
-        pContentPos = pFrameFormat->GetAnchor().GetContentAnchor();
+        pAnchor = &pFrameFormat->GetAnchor();
     }
 
     pSh->CalcBoundRect( aBoundRect, eAnchorType,
                            rValidation.nHRelOrient,
                            rValidation.nVRelOrient,
-                           pContentPos,
+                           pAnchor,
                            rValidation.bFollowTextFlow,
                            rValidation.bMirror, nullptr, &rValidation.aPercentSize);