RotateFlyFrame: Isolate SwFrame members maFrame and maPrt feature/RotateFlyFrame

To gain more control over changes of the Writer layout,
isolated mentioned members and replaced all calls with
inline methods for read access. Moved to own class to
also identify 'private' accesses reliably. Added access
dedicated classes for write access, the only allowed
way to do changes. Adapted all usages and made test builds
on logerrit and locally

Change-Id: Ib0b7f852f5176744e860e2aad12dd13c9a906d68

RotateFlyFrame: Migrated from SwFrame::FrameWA to setFrame

Change-Id: I01f7b828fe2134411cc76639e880da46b415d767

RotateFlyFrame: Migrated from SwFrame::PrintWA to setPrint

Change-Id: Ieea3b467f296a190de5b5f47721bef148bebf60b

RotateFlyFrame: Adapted to get/setSwFrame and get/setSwPrint

Change-Id: I6cce40ec49dd5bd32d94fe06b9d2dabd368448be

RotateFlyFrame: Adapted to get methods and WriteAccess helpers

Change-Id: Ife3c1b2391ad7beae8c7f31f796b1454709ddd26

RotateFlyFrame: Moved change executers to cxx

Moved SwFrameRect::FrameWriteAccess::~FrameWriteAccess()
and SwFrameRect::PrintWriteAccess::~PrintWriteAccess() to
implementation side and added compare op's for SwRcet to
write only if needed

Change-Id: I85d0e61009116f4b17d1ce0337e3f0d2cc031159

RotateFlyFrame: Moved change executers to cxx

Moved SwFrameRect::FrameWriteAccess::~FrameWriteAccess()
and SwFrameRect::PrintWriteAccess::~PrintWriteAccess() to
implementation side and added compare op's for SwRcet to
write only if needed

Change-Id: I85d0e61009116f4b17d1ce0337e3f0d2cc031159

1 files changed, 60 insertions, 60 deletions

diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 8cfbec1f17cf..add551fe8680 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -176,12 +176,12 @@ bool SwPageFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
     Point aPoint( rPoint );
 
     // check, if we have to adjust the point
-    if ( !Frame().IsInside( aPoint ) )
+    if ( !getSwFrame().IsInside( aPoint ) )
     {
-        aPoint.X() = std::max( aPoint.X(), Frame().Left() );
-        aPoint.X() = std::min( aPoint.X(), Frame().Right() );
-        aPoint.Y() = std::max( aPoint.Y(), Frame().Top() );
-        aPoint.Y() = std::min( aPoint.Y(), Frame().Bottom() );
+        aPoint.X() = std::max( aPoint.X(), getSwFrame().Left() );
+        aPoint.X() = std::min( aPoint.X(), getSwFrame().Right() );
+        aPoint.Y() = std::max( aPoint.Y(), getSwFrame().Top() );
+        aPoint.Y() = std::min( aPoint.Y(), getSwFrame().Bottom() );
     }
 
     bool bTextRet = false;
@@ -398,9 +398,9 @@ bool SwRootFrame::FillSelection( SwSelectionList& aSelList, const SwRect& rRect)
     const long nBottom = rRect.Bottom();
     while( pPage )
     {
-        if( pPage->Frame().Top() < nBottom )
+        if( pPage->getSwFrame().Top() < nBottom )
         {
-            if( pPage->Frame().Bottom() > rRect.Top() )
+            if( pPage->getSwFrame().Bottom() > rRect.Top() )
                 pPage->FillSelection( aSelList, rRect );
             pPage = pPage->GetNext();
         }
@@ -430,8 +430,8 @@ bool SwRootFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
     // #i95626#
     // special handling for <rPoint> beyond root frames area
     if ( !pPage &&
-         rPoint.X() > Frame().Right() &&
-         rPoint.Y() > Frame().Bottom() )
+         rPoint.X() > getSwFrame().Right() &&
+         rPoint.Y() > getSwFrame().Bottom() )
     {
         pPage = dynamic_cast<const SwPageFrame*>(Lower());
         while ( pPage && pPage->GetNext() )
@@ -496,7 +496,7 @@ bool SwCellFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
             while ( pFrame && !bRet )
             {
                 pFrame->Calc(pRenderContext);
-                if ( pFrame->Frame().IsInside( rPoint ) )
+                if ( pFrame->getSwFrame().IsInside( rPoint ) )
                 {
                     bRet = pFrame->GetCursorOfst( pPos, rPoint, pCMS );
                     if ( pCMS && pCMS->m_bStop )
@@ -539,7 +539,7 @@ bool SwFlyFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
     //However if the Point sits inside a Fly which is completely located inside
     //the current one, we call GetCursorOfst for it.
     Calc(pRenderContext);
-    bool bInside = Frame().IsInside( rPoint ) && Lower();
+    bool bInside = getSwFrame().IsInside( rPoint ) && Lower();
     bool bRet = false;
 
     //If an Frame contains a graphic, but only text was requested, it basically
@@ -557,8 +557,8 @@ bool SwFlyFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
         {
             const SwVirtFlyDrawObj* pObj = static_cast<const SwVirtFlyDrawObj*>(aIter());
             const SwFlyFrame* pFly = pObj ? pObj->GetFlyFrame() : nullptr;
-            if ( pFly && pFly->Frame().IsInside( rPoint ) &&
-                 Frame().IsInside( pFly->Frame() ) )
+            if ( pFly && pFly->getSwFrame().IsInside( rPoint ) &&
+                 getSwFrame().IsInside( pFly->getSwFrame() ) )
             {
                 if (g_OszCtrl.ChkOsz(pFly))
                     break;
@@ -578,7 +578,7 @@ bool SwFlyFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
         while ( pFrame && !bRet )
         {
             pFrame->Calc(pRenderContext);
-            if ( pFrame->Frame().IsInside( rPoint ) )
+            if ( pFrame->getSwFrame().IsInside( rPoint ) )
             {
                 bRet = pFrame->GetCursorOfst( pPos, rPoint, pCMS );
                 if ( pCMS && pCMS->m_bStop )
@@ -741,7 +741,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame *pStart,
     if ( bTab )
     {
         // pStart or pCnt is inside a table. nX will be used for travelling:
-        SwRect aRect( pStart->Frame() );
+        SwRect aRect( pStart->getSwFrame() );
         pStart->GetCharRect( aRect, *pPam->GetPoint() );
         Point aCenter = aRect.Center();
         nX = aRectFnSet.IsVert() ? aCenter.Y() : aCenter.X();
@@ -758,16 +758,16 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame *pStart,
             while ( pCell && !pCell->IsCellFrame() )
                 pCell = pCell->GetUpper();
             OSL_ENSURE( pCell, "could not find the cell" );
-            nX =  aRectFnSet.GetLeft(pCell->Frame()) +
-                  aRectFnSet.GetWidth(pCell->Frame()) / 2;
+            nX =  aRectFnSet.GetLeft(pCell->getSwFrame()) +
+                  aRectFnSet.GetWidth(pCell->getSwFrame()) / 2;
 
             //The flow leads from one table to the next. The X-value needs to be
             //corrected based on the middle of the starting cell by the amount
             //of the offset of the tables.
             if ( pStTab != pTable )
             {
-                nX += aRectFnSet.GetLeft(pTable->Frame()) -
-                      aRectFnSet.GetLeft(pStTab->Frame());
+                nX += aRectFnSet.GetLeft(pTable->getSwFrame()) -
+                      aRectFnSet.GetLeft(pStTab->getSwFrame());
             }
         }
 
@@ -870,7 +870,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame *pStart,
                          if ( pTable &&
                               !pTab->GetUpper()->IsInTab() &&
                             !pTable->GetUpper()->IsInTab() )
-                            nX += pTab->Frame().Left() - pTable->Frame().Left();
+                            nX += pTab->getSwFrame().Left() - pTable->getSwFrame().Left();
                         pTable = pTab;
                     }
                     const SwLayoutFrame *pCell = pCnt->GetUpper();
@@ -881,7 +881,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame *pStart,
                     Point aInsideCnt;
                     if ( pCell )
                     {
-                        long nTmpTop = aRectFnSet.GetTop(pCell->Frame());
+                        long nTmpTop = aRectFnSet.GetTop(pCell->getSwFrame());
                         if ( aRectFnSet.IsVert() )
                         {
                             if ( nTmpTop )
@@ -893,7 +893,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame *pStart,
                             aInsideCell = Point( nX, nTmpTop );
                     }
 
-                    long nTmpTop = aRectFnSet.GetTop(pCnt->Frame());
+                    long nTmpTop = aRectFnSet.GetTop(pCnt->getSwFrame());
                     if ( aRectFnSet.IsVert() )
                     {
                         if ( nTmpTop )
@@ -904,11 +904,11 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame *pStart,
                     else
                         aInsideCnt = Point( nX, nTmpTop );
 
-                    if ( pCell && pCell->Frame().IsInside( aInsideCell ) )
+                    if ( pCell && pCell->getSwFrame().IsInside( aInsideCell ) )
                     {
                         bEnd = true;
                         //Get the right Content out of the cell.
-                        if ( !pCnt->Frame().IsInside( aInsideCnt ) )
+                        if ( !pCnt->getSwFrame().IsInside( aInsideCnt ) )
                         {
                             pCnt = pCell->ContainsContent();
                             if ( fnNxtPrv == lcl_GetPrvCnt )
@@ -916,7 +916,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame *pStart,
                                     pCnt = pCnt->GetNextContentFrame();
                         }
                     }
-                    else if ( pCnt->Frame().IsInside( aInsideCnt ) )
+                    else if ( pCnt->getSwFrame().IsInside( aInsideCnt ) )
                         bEnd = true;
                 }
             }
@@ -1022,8 +1022,8 @@ sal_uInt16 SwRootFrame::SetCurrPage( SwCursor* pToSet, sal_uInt16 nPageNum )
         if( pSCursor )
         {
             Point &rPt = pSCursor->GetPtPos();
-            rPt = pContent->Frame().Pos();
-            rPt += pContent->Prt().Pos();
+            rPt = pContent->getSwFrame().Pos();
+            rPt += pContent->getSwPrint().Pos();
         }
         return pPage->GetPhyPageNum();
     }
@@ -1147,12 +1147,12 @@ static const SwLayoutFrame* lcl_Inside( const SwContentFrame *pCnt, Point& rPt )
     {
         if( pUp->IsPageBodyFrame() || pUp->IsFooterFrame() || pUp->IsHeaderFrame() )
         {
-            if( rPt.Y() >= pUp->Frame().Top() && rPt.Y() <= pUp->Frame().Bottom() )
+            if( rPt.Y() >= pUp->getSwFrame().Top() && rPt.Y() <= pUp->getSwFrame().Bottom() )
                 return pUp;
             return nullptr;
         }
         if( pUp->IsFootnoteContFrame() )
-            return pUp->Frame().IsInside( rPt ) ? pUp : nullptr;
+            return pUp->getSwFrame().IsInside( rPt ) ? pUp : nullptr;
         pUp = pUp->GetUpper();
     }
     return nullptr;
@@ -1195,7 +1195,7 @@ const SwContentFrame *SwLayoutFrame::GetContentPos( Point& rPoint,
                 ((!bDontLeave || IsAnLower( pContent )) &&
                 (pContent->GetPhyPageNum() <= nMaxPage)) )
         {
-            if ( pContent->Frame().Width() &&
+            if ( pContent->getSwFrame().Width() &&
                  ( !bBodyOnly || pContent->IsInDocBody() ) )
             {
                 //If the Content lies in a protected area (cell, Footnote, section),
@@ -1319,34 +1319,34 @@ const SwContentFrame *SwLayoutFrame::GetContentPos( Point& rPoint,
     }
 
     //A small correction at the first/last
-    Size aActualSize( pActual->Prt().SSize() );
-    if ( aActualSize.Height() > pActual->GetUpper()->Prt().Height() )
-        aActualSize.Height() = pActual->GetUpper()->Prt().Height();
+    Size aActualSize( pActual->getSwPrint().SSize() );
+    if ( aActualSize.Height() > pActual->GetUpper()->getSwPrint().Height() )
+        aActualSize.Height() = pActual->GetUpper()->getSwPrint().Height();
 
     SwRectFnSet aRectFnSet(pActual);
     if ( !pActual->GetPrev() &&
          aRectFnSet.YDiff( aRectFnSet.GetPrtTop(*pActual),
                               aRectFnSet.IsVert() ? rPoint.X() : rPoint.Y() ) > 0 )
     {
-        aPoint.Y() = pActual->Frame().Top() + pActual->Prt().Top();
-        aPoint.X() = pActual->Frame().Left() +
+        aPoint.Y() = pActual->getSwFrame().Top() + pActual->getSwPrint().Top();
+        aPoint.X() = pActual->getSwFrame().Left() +
                         ( pActual->IsRightToLeft() || aRectFnSet.IsVert() ?
-                          pActual->Prt().Right() :
-                          pActual->Prt().Left() );
+                          pActual->getSwPrint().Right() :
+                          pActual->getSwPrint().Left() );
     }
     else if ( !pActual->GetNext() &&
               aRectFnSet.YDiff( aRectFnSet.GetPrtBottom(*pActual),
                                    aRectFnSet.IsVert() ? rPoint.X() : rPoint.Y() ) < 0 )
     {
-        aPoint.Y() = pActual->Frame().Top() + pActual->Prt().Bottom();
-        aPoint.X() = pActual->Frame().Left() +
+        aPoint.Y() = pActual->getSwFrame().Top() + pActual->getSwPrint().Bottom();
+        aPoint.X() = pActual->getSwFrame().Left() +
                         ( pActual->IsRightToLeft() || aRectFnSet.IsVert() ?
-                          pActual->Prt().Left() :
-                          pActual->Prt().Right() );
+                          pActual->getSwPrint().Left() :
+                          pActual->getSwPrint().Right() );
     }
 
     //Bring the Point in to the PrtArea
-    const SwRect aRect( pActual->Frame().Pos() + pActual->Prt().Pos(),
+    const SwRect aRect( pActual->getSwFrame().Pos() + pActual->getSwPrint().Pos(),
                         aActualSize );
     if ( aPoint.Y() < aRect.Top() )
         aPoint.Y() = aRect.Top();
@@ -1413,7 +1413,7 @@ void SwPageFrame::GetContentPosition( const Point &rPt, SwPosition &rPos ) const
             nDist   = nDiff;
             pAct    = pContent;
         }
-        else if ( aContentFrame.Top() > Frame().Bottom() )
+        else if ( aContentFrame.Top() > getSwFrame().Bottom() )
             //In terms of fields, it's not possible to be closer any more!
             break;
 
@@ -1423,7 +1423,7 @@ void SwPageFrame::GetContentPosition( const Point &rPt, SwPosition &rPos ) const
     }
 
     //Bring the point into the PrtArea.
-    const SwRect aRect( pAct->Frame().Pos() + pAct->Prt().Pos(), pAct->Prt().SSize() );
+    const SwRect aRect( pAct->getSwFrame().Pos() + pAct->getSwPrint().Pos(), pAct->getSwPrint().SSize() );
     if ( aAct.Y() < aRect.Top() )
         aAct.Y() = aRect.Top();
     else if ( aAct.Y() > aRect.Bottom() )
@@ -1466,7 +1466,7 @@ Point SwRootFrame::GetNextPrevContentPos( const Point& rPoint, bool bNext ) cons
     //page.
     const SwLayoutFrame *pPage = static_cast<const SwLayoutFrame*>(Lower());
     if( pPage )
-        while( pPage->GetNext() && pPage->Frame().Bottom() < rPoint.Y() )
+        while( pPage->GetNext() && pPage->getSwFrame().Bottom() < rPoint.Y() )
             pPage = static_cast<const SwLayoutFrame*>(pPage->GetNext());
 
     const SwContentFrame *pCnt = pPage ? pPage->ContainsContent() : ContainsContent();
@@ -1481,7 +1481,7 @@ Point SwRootFrame::GetNextPrevContentPos( const Point& rPoint, bool bNext ) cons
     {
         // As long as the point lies before the first ContentFrame and there are
         // still precedent pages I'll go to the next page.
-        while ( rPoint.Y() < pCnt->Frame().Top() && pPage->GetPrev() )
+        while ( rPoint.Y() < pCnt->getSwFrame().Top() && pPage->GetPrev() )
         {
             pPage = static_cast<const SwLayoutFrame*>(pPage->GetPrev());
             pCnt = pPage->ContainsContent();
@@ -1498,7 +1498,7 @@ Point SwRootFrame::GetNextPrevContentPos( const Point& rPoint, bool bNext ) cons
     }
 
     //Does the point lie above the first ContentFrame?
-    if ( rPoint.Y() < pCnt->Frame().Top() && !lcl_IsInRepeatedHeadline( pCnt ) )
+    if ( rPoint.Y() < pCnt->getSwFrame().Top() && !lcl_IsInRepeatedHeadline( pCnt ) )
         return pCnt->UnionFrame().Pos();
 
     Point aRet(0, 0);
@@ -1530,12 +1530,12 @@ Point SwRootFrame::GetNextPrevContentPos( const Point& rPoint, bool bNext ) cons
         //searched.
         const SwTabFrame* pTFrame;
         pNxt->Calc(pRenderContext);
-        if( pNxt->Frame().Top() > rPoint.Y() &&
+        if( pNxt->getSwFrame().Top() > rPoint.Y() &&
             !lcl_IsInRepeatedHeadline( pCnt, &pTFrame ) &&
-            ( !pTFrame || pNxt->Frame().Left() > rPoint.X() ))
+            ( !pTFrame || pNxt->getSwFrame().Left() > rPoint.X() ))
         {
             if (bNext)
-                aRet = pNxt->Frame().Pos();
+                aRet = pNxt->getSwFrame().Pos();
             else
                 aRet = Point( aContentFrame.Right(), aContentFrame.Bottom() );
             break;
@@ -1564,7 +1564,7 @@ Point SwRootFrame::GetPagePos( sal_uInt16 nPageNum ) const
             break;
         pPage = static_cast<const SwPageFrame*>(pPage->GetNext());
     }
-    return pPage->Frame().Pos();
+    return pPage->getSwFrame().Pos();
 }
 
 /** get page frame by phyiscal page number
@@ -1771,10 +1771,10 @@ void SwFrame::Calc(vcl::RenderContext* pRenderContext) const
 
 Point SwFrame::GetRelPos() const
 {
-    Point aRet( maFrame.Pos() );
+    Point aRet( getSwFrame().Pos() );
     // here we cast since SwLayoutFrame is declared only as forwarded
-    aRet -= GetUpper()->Prt().Pos();
-    aRet -= GetUpper()->Frame().Pos();
+    aRet -= GetUpper()->getSwPrint().Pos();
+    aRet -= GetUpper()->getSwFrame().Pos();
     return aRet;
 }
 
@@ -1893,7 +1893,7 @@ bool SwRootFrame::MakeTableCursors( SwTableCursor& rTableCursor )
 
             while ( pRow )
             {
-                if ( pRow->Frame().IsOver( rUnion.GetUnion() ) )
+                if ( pRow->getSwFrame().IsOver( rUnion.GetUnion() ) )
                 {
                     const SwLayoutFrame *pCell = pRow->FirstCell();
 
@@ -1995,7 +1995,7 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor)
     // #i12836# enhanced pdf
     SwRegionRects aRegion( !bIgnoreVisArea ?
                            pSh->VisArea() :
-                           Frame() );
+                           getSwFrame() );
     if( !pStartPos->nNode.GetNode().IsContentNode() ||
         !pStartPos->nNode.GetNode().GetContentNode()->getLayoutFrame(this) ||
         ( pStartPos->nNode != pEndPos->nNode &&
@@ -2387,8 +2387,8 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor)
             }
             else
             {
-                lLeft = aRectFnSet.GetLeft(pStartFrame->Frame()) +
-                    aRectFnSet.GetLeft(pStartFrame->Prt());
+                lLeft = aRectFnSet.GetLeft(pStartFrame->getSwFrame()) +
+                    aRectFnSet.GetLeft(pStartFrame->getSwPrint());
                 lRight = aRectFnSet.GetRight(aEndFrame);
             }
             if( lLeft < aRectFnSet.GetLeft(aStFrame) )
@@ -2556,7 +2556,7 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor)
                     }
                 }
                 if( inSelection )
-                        Add( aRegion, pFly->Frame() );
+                        Add( aRegion, pFly->getSwFrame() );
                 else if ( !pFly->IsAnLower( pStartFrame ) &&
                     (rSur.GetSurround() != css::text::WrapTextMode_THROUGH &&
                     !rSur.IsContour()) )
@@ -2584,7 +2584,7 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor)
                         } while ( bSub && pTmp );
                     }
                     if ( bSub )
-                        Sub( aRegion, pFly->Frame() );
+                        Sub( aRegion, pFly->getSwFrame() );
                 }
             }
         }