1 files changed, 11 insertions, 11 deletions

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 606b778387ea..01c3ac4c42e1 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -90,12 +90,12 @@ void SwCursorShell::MoveCursorToNum()
     if( pFrame->IsVertical() )
     {
         aPt.setX(m_aCharRect.Center().getX());
-        aPt.setY(pFrame->Frame().Top() + GetUpDownX());
+        aPt.setY(pFrame->getSwFrame().Top() + GetUpDownX());
     }
     else
     {
         aPt.setY(m_aCharRect.Center().getY());
-        aPt.setX(pFrame->Frame().Left() + GetUpDownX());
+        aPt.setX(pFrame->getSwFrame().Left() + GetUpDownX());
     }
     pFrame->GetCursorOfst( m_pCurrentCursor->GetPoint(), aPt );
     if ( !m_pCurrentCursor->IsSelOvr( SwCursorSelOverFlags::Toggle |
@@ -142,7 +142,7 @@ bool SwCursorShell::GotoHeaderText()
         SwCursor *pTmpCursor = getShellCursor( true );
         SwCursorSaveState aSaveState( *pTmpCursor );
         pFrame->Calc(GetOut());
-        Point aPt( pFrame->Frame().Pos() + pFrame->Prt().Pos() );
+        Point aPt( pFrame->getSwFrame().Pos() + pFrame->getSwPrint().Pos() );
         pFrame->GetCursorOfst( pTmpCursor->GetPoint(), aPt );
         if( !pTmpCursor->IsSelOvr() )
             UpdateCursor();
@@ -174,7 +174,7 @@ bool SwCursorShell::GotoFooterText()
             SwCallLink aLk( *this ); // watch Cursor-Moves
             SwCursorSaveState aSaveState( *pTmpCursor );
             pLower->Calc(GetOut());
-            Point aPt( pLower->Frame().Pos() + pLower->Prt().Pos() );
+            Point aPt( pLower->getSwFrame().Pos() + pLower->getSwPrint().Pos() );
             pLower->GetCursorOfst( pTmpCursor->GetPoint(), aPt );
             if( !pTmpCursor->IsSelOvr() )
                 UpdateCursor();
@@ -1443,8 +1443,8 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
                                 pFrame->GetCharRect(aEnd, aEndPos, &aTmpState);
                                 if (aStart.Top() != aEnd.Top() || aStart.Bottom() != aEnd.Bottom())
                                 {
-                                    aStart.Left(pFrame->Frame().Left());
-                                    aEnd.Right(pFrame->Frame().Right());
+                                    aStart.Left(pFrame->getSwFrame().Left());
+                                    aEnd.Right(pFrame->getSwFrame().Right());
                                 }
                                 *pFieldRect = aStart.Union(aEnd);
                             }
@@ -1471,8 +1471,8 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
                             pFrame->GetCharRect(aEnd, *pRedl->End(), &aTmpState);
                             if (aStart.Top() != aEnd.Top() || aStart.Bottom() != aEnd.Bottom())
                             {
-                                aStart.Left(pFrame->Frame().Left());
-                                aEnd.Right(pFrame->Frame().Right());
+                                aStart.Left(pFrame->getSwFrame().Left());
+                                aEnd.Right(pFrame->getSwFrame().Right());
                             }
                             *pFieldRect = aStart.Union(aEnd);
                         }
@@ -1516,7 +1516,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
 
                     if( aTmpState.m_bPosCorr )
                     {
-                        if( pF && !pF->Frame().IsInside( aPt ))
+                        if( pF && !pF->getSwFrame().IsInside( aPt ))
                             pF = nullptr;
                     }
                     else if( !pF )
@@ -1551,8 +1551,8 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
                         {
                             if( pFieldRect )
                             {
-                                *pFieldRect = pF->Prt();
-                                *pFieldRect += pF->Frame().Pos();
+                                *pFieldRect = pF->getSwPrint();
+                                *pFieldRect += pF->getSwFrame().Pos();
                             }
                             rContentAtPos.pFndTextAttr = nullptr;
                             rContentAtPos.aFnd.pAttr = pItem;