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, 89 insertions, 89 deletions

diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 0d8ffeba54c6..c4248c71c0d6 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -293,7 +293,7 @@ void GetTableSel( const SwLayoutFrame* pStart, const SwLayoutFrame* pEnd,
                     break;
                 }
 
-                if ( pRow->Frame().IsOver( pUnion->GetUnion() ) )
+                if ( pRow->getSwFrame().IsOver( pUnion->GetUnion() ) )
                 {
                     const SwLayoutFrame *pCell = pRow->FirstCell();
 
@@ -317,10 +317,10 @@ void GetTableSel( const SwLayoutFrame* pStart, const SwLayoutFrame* pEnd,
 
                             if ( pCells )
                             {
-                                const Point aTopLeft( pCell->Frame().TopLeft() );
-                                const Point aTopRight( pCell->Frame().TopRight() );
-                                const Point aBottomLeft( pCell->Frame().BottomLeft() );
-                                const Point aBottomRight( pCell->Frame().BottomRight() );
+                                const Point aTopLeft( pCell->getSwFrame().TopLeft() );
+                                const Point aTopRight( pCell->getSwFrame().TopRight() );
+                                const Point aBottomLeft( pCell->getSwFrame().BottomLeft() );
+                                const Point aBottomRight( pCell->getSwFrame().BottomRight() );
 
                                 if ( aTopLeft.getY() < aCurrentTopLeft.getY() ||
                                      ( aTopLeft.getY() == aCurrentTopLeft.getY() &&
@@ -497,7 +497,7 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
                     break;
                 }
 
-                if( pRow->Frame().IsOver( pUnion->GetUnion() ) )
+                if( pRow->getSwFrame().IsOver( pUnion->GetUnion() ) )
                 {
                     const SwLayoutFrame *pCell = pRow->FirstCell();
 
@@ -512,7 +512,7 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
 
                         OSL_ENSURE( pCell->IsCellFrame(), "Frame without Cell" );
                         const SwRect& rUnion = pUnion->GetUnion(),
-                                    & rFrameRect = pCell->Frame();
+                                    & rFrameRect = pCell->getSwFrame();
 
                         const long nUnionRight = rUnion.Right();
                         const long nUnionBottom = rUnion.Bottom();
@@ -576,7 +576,7 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
             for( n = 0 ; n < aCellFrames.size(); ++n )
             {
                 const Sort_CellFrame& rCF = aCellFrames[ n ];
-                if( aRectFnSet.GetTop(rCF.pFrame->Frame()) != nYPos )
+                if( aRectFnSet.GetTop(rCF.pFrame->getSwFrame()) != nYPos )
                 {
                     // new row
                     if( n )
@@ -590,20 +590,20 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
                         }
                     }
                     nCellCnt = 1;
-                    nYPos = aRectFnSet.GetTop(rCF.pFrame->Frame());
-                    nHeight = aRectFnSet.GetHeight(rCF.pFrame->Frame());
+                    nYPos = aRectFnSet.GetTop(rCF.pFrame->getSwFrame());
+                    nHeight = aRectFnSet.GetHeight(rCF.pFrame->getSwFrame());
 
                     nXPos = bRTL ?
-                            aRectFnSet.GetLeft(rCF.pFrame->Frame()) :
-                            aRectFnSet.GetRight(rCF.pFrame->Frame());
+                            aRectFnSet.GetLeft(rCF.pFrame->getSwFrame()) :
+                            aRectFnSet.GetRight(rCF.pFrame->getSwFrame());
                 }
                 else if( nXPos == ( bRTL ?
-                                    aRectFnSet.GetRight(rCF.pFrame->Frame()) :
-                                    aRectFnSet.GetLeft(rCF.pFrame->Frame()) ) &&
-                         nHeight == aRectFnSet.GetHeight(rCF.pFrame->Frame()) )
+                                    aRectFnSet.GetRight(rCF.pFrame->getSwFrame()) :
+                                    aRectFnSet.GetLeft(rCF.pFrame->getSwFrame()) ) &&
+                         nHeight == aRectFnSet.GetHeight(rCF.pFrame->getSwFrame()) )
                 {
                     nXPos += ( bRTL ? (-1) : 1 ) *
-                             aRectFnSet.GetWidth(rCF.pFrame->Frame());
+                             aRectFnSet.GetWidth(rCF.pFrame->getSwFrame());
                     ++nCellCnt;
                 }
                 else
@@ -649,22 +649,22 @@ bool IsFrameInTableSel( const SwRect& rUnion, const SwFrame* pCell )
     OSL_ENSURE( pCell->IsCellFrame(), "Frame without Gazelle" );
 
     if( pCell->FindTabFrame()->IsVertical() )
-        return   rUnion.Right() >= pCell->Frame().Right() &&
-                 rUnion.Left() <= pCell->Frame().Left() &&
-            (( rUnion.Top() <= pCell->Frame().Top()+20 &&
-               rUnion.Bottom() > pCell->Frame().Top() ) ||
-             ( rUnion.Top() >= pCell->Frame().Top() &&
-               rUnion.Bottom() < pCell->Frame().Bottom() ));
+        return   rUnion.Right() >= pCell->getSwFrame().Right() &&
+                 rUnion.Left() <= pCell->getSwFrame().Left() &&
+            (( rUnion.Top() <= pCell->getSwFrame().Top()+20 &&
+               rUnion.Bottom() > pCell->getSwFrame().Top() ) ||
+             ( rUnion.Top() >= pCell->getSwFrame().Top() &&
+               rUnion.Bottom() < pCell->getSwFrame().Bottom() ));
 
     return
-        rUnion.Top() <= pCell->Frame().Top() &&
-        rUnion.Bottom() >= pCell->Frame().Bottom() &&
+        rUnion.Top() <= pCell->getSwFrame().Top() &&
+        rUnion.Bottom() >= pCell->getSwFrame().Bottom() &&
 
-        (( rUnion.Left() <= pCell->Frame().Left()+20 &&
-           rUnion.Right() > pCell->Frame().Left() ) ||
+        (( rUnion.Left() <= pCell->getSwFrame().Left()+20 &&
+           rUnion.Right() > pCell->getSwFrame().Left() ) ||
 
-         ( rUnion.Left() >= pCell->Frame().Left() &&
-           rUnion.Right() < pCell->Frame().Right() ));
+         ( rUnion.Left() >= pCell->getSwFrame().Left() &&
+           rUnion.Right() < pCell->getSwFrame().Right() ));
 }
 
 bool GetAutoSumSel( const SwCursorShell& rShell, SwCellFrames& rBoxes )
@@ -703,7 +703,7 @@ bool GetAutoSumSel( const SwCursorShell& rShell, SwCellFrames& rBoxes )
 
         while( pRow )
         {
-            if( pRow->Frame().IsOver( pUnion->GetUnion() ) )
+            if( pRow->getSwFrame().IsOver( pUnion->GetUnion() ) )
             {
                 const SwCellFrame* pUpperCell = nullptr;
                 const SwLayoutFrame *pCell = pRow->FirstCell();
@@ -772,7 +772,7 @@ bool GetAutoSumSel( const SwCursorShell& rShell, SwCellFrames& rBoxes )
 
             while( pRow )
             {
-                if( pRow->Frame().IsOver( pUnion->GetUnion() ) )
+                if( pRow->getSwFrame().IsOver( pUnion->GetUnion() ) )
                 {
                     const SwLayoutFrame *pCell = pRow->FirstCell();
 
@@ -946,7 +946,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
 
         while ( pRow )
         {
-            if ( pRow->Frame().IsOver( rUnion ) )
+            if ( pRow->getSwFrame().IsOver( rUnion ) )
             {
                 const SwLayoutFrame *pCell = pRow->FirstCell();
 
@@ -954,25 +954,25 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
                 {
                     OSL_ENSURE( pCell->IsCellFrame(), "Frame without cell" );
                     // overlap in full width?
-                    if( rUnion.Top() <= pCell->Frame().Top() &&
-                        rUnion.Bottom() >= pCell->Frame().Bottom() )
+                    if( rUnion.Top() <= pCell->getSwFrame().Top() &&
+                        rUnion.Bottom() >= pCell->getSwFrame().Bottom() )
                     {
                         SwTableBox* pBox = const_cast<SwTableBox*>(static_cast<const SwCellFrame*>(pCell)->GetTabBox());
 
                         // only overlap to the right?
-                        if( ( rUnion.Left() - COLFUZZY ) <= pCell->Frame().Left() &&
-                            ( rUnion.Right() - COLFUZZY ) > pCell->Frame().Left() )
+                        if( ( rUnion.Left() - COLFUZZY ) <= pCell->getSwFrame().Left() &&
+                            ( rUnion.Right() - COLFUZZY ) > pCell->getSwFrame().Left() )
                         {
-                            if( ( rUnion.Right() + COLFUZZY ) < pCell->Frame().Right() )
+                            if( ( rUnion.Right() + COLFUZZY ) < pCell->getSwFrame().Right() )
                             {
                                 sal_uInt16 nInsPos = pBox->GetUpper()->GetBoxPos( pBox )+1;
                                 lcl_InsTableBox( pTableNd, pDoc, pBox, nInsPos );
                                 pBox->ClaimFrameFormat();
                                 SwFormatFrameSize aNew(
                                         pBox->GetFrameFormat()->GetFrameSize() );
-                                nWidth = rUnion.Right() - pCell->Frame().Left();
+                                nWidth = rUnion.Right() - pCell->getSwFrame().Left();
                                 nWidth = nWidth * aNew.GetWidth() /
-                                         pCell->Frame().Width();
+                                         pCell->getSwFrame().Width();
                                 long nTmpWidth = aNew.GetWidth() - nWidth;
                                 aNew.SetWidth( nWidth );
                                 pBox->GetFrameFormat()->SetFormatAttr( aNew );
@@ -980,7 +980,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
                                 pLastBox = pBox;
                                 rBoxes.insert( pBox );
                                 aPosArr.insert(
-                                    CmpLPt( aRectFnSet.GetPos(pCell->Frame()),
+                                    CmpLPt( aRectFnSet.GetPos(pCell->getSwFrame()),
                                     pBox, aRectFnSet.IsVert() ) );
 
                                 pBox = pBox->GetUpper()->GetTabBoxes()[ nInsPos ];
@@ -997,25 +997,25 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
                                 pLastBox = pBox;
                                 rBoxes.insert( pBox );
                                 aPosArr.insert(
-                                    CmpLPt( aRectFnSet.GetPos(pCell->Frame()),
+                                    CmpLPt( aRectFnSet.GetPos(pCell->getSwFrame()),
                                     pBox, aRectFnSet.IsVert() ) );
                             }
                         }
                         // overlapping on left- or right-side
-                        else if( ( rUnion.Left() - COLFUZZY ) >= pCell->Frame().Left() &&
-                                ( rUnion.Right() + COLFUZZY ) < pCell->Frame().Right() )
+                        else if( ( rUnion.Left() - COLFUZZY ) >= pCell->getSwFrame().Left() &&
+                                ( rUnion.Right() + COLFUZZY ) < pCell->getSwFrame().Right() )
                         {
                             sal_uInt16 nInsPos = pBox->GetUpper()->GetBoxPos( pBox )+1;
                             lcl_InsTableBox( pTableNd, pDoc, pBox, nInsPos, 2 );
                             pBox->ClaimFrameFormat();
                             SwFormatFrameSize aNew(
                                         pBox->GetFrameFormat()->GetFrameSize() );
-                            long nLeft = rUnion.Left() - pCell->Frame().Left();
+                            long nLeft = rUnion.Left() - pCell->getSwFrame().Left();
                             nLeft = nLeft * aNew.GetWidth() /
-                                    pCell->Frame().Width();
-                            long nRight = pCell->Frame().Right() - rUnion.Right();
+                                    pCell->getSwFrame().Width();
+                            long nRight = pCell->getSwFrame().Right() - rUnion.Right();
                             nRight = nRight * aNew.GetWidth() /
-                                     pCell->Frame().Width();
+                                     pCell->getSwFrame().Width();
                             nWidth = aNew.GetWidth() - nLeft - nRight;
 
                             aNew.SetWidth( nLeft );
@@ -1044,7 +1044,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
                             pLastBox = pBox;
                             rBoxes.insert( pBox );
                             aPosArr.insert(
-                                CmpLPt( aRectFnSet.GetPos(pCell->Frame()),
+                                CmpLPt( aRectFnSet.GetPos(pCell->getSwFrame()),
                                 pBox, aRectFnSet.IsVert() ) );
 
                             pBox = pBox->GetUpper()->GetTabBoxes()[ nInsPos+1 ];
@@ -1056,22 +1056,22 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
                                 pUndo->AddNewBox( pBox->GetSttIdx() );
                         }
                        // is right side of box part of the selected area?
-                        else if( ( pCell->Frame().Right() - COLFUZZY ) < rUnion.Right() &&
-                                 ( pCell->Frame().Right() - COLFUZZY ) > rUnion.Left() &&
-                                 ( pCell->Frame().Left() + COLFUZZY ) < rUnion.Left() )
+                        else if( ( pCell->getSwFrame().Right() - COLFUZZY ) < rUnion.Right() &&
+                                 ( pCell->getSwFrame().Right() - COLFUZZY ) > rUnion.Left() &&
+                                 ( pCell->getSwFrame().Left() + COLFUZZY ) < rUnion.Left() )
                         {
                             // then we should insert a new box and adjust the widths
                             sal_uInt16 nInsPos = pBox->GetUpper()->GetBoxPos( pBox )+1;
                             lcl_InsTableBox( pTableNd, pDoc, pBox, nInsPos );
 
                             SwFormatFrameSize aNew(pBox->GetFrameFormat()->GetFrameSize() );
-                            long nLeft = rUnion.Left() - pCell->Frame().Left(),
-                                nRight = pCell->Frame().Right() - rUnion.Left();
+                            long nLeft = rUnion.Left() - pCell->getSwFrame().Left(),
+                                nRight = pCell->getSwFrame().Right() - rUnion.Left();
 
                             nLeft = nLeft * aNew.GetWidth() /
-                                    pCell->Frame().Width();
+                                    pCell->getSwFrame().Width();
                             nRight = nRight * aNew.GetWidth() /
-                                    pCell->Frame().Width();
+                                    pCell->getSwFrame().Width();
 
                             aNew.SetWidth( nLeft );
                             pBox->ClaimFrameFormat()->SetFormatAttr( aNew );
@@ -1085,7 +1085,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
                             pLastBox = pBox;
                             rBoxes.insert( pBox );
                             aPosArr.insert( CmpLPt( Point( rUnion.Left(),
-                                                pCell->Frame().Top()), pBox, aRectFnSet.IsVert() ));
+                                                pCell->getSwFrame().Top()), pBox, aRectFnSet.IsVert() ));
 
                             if( pUndo )
                                 pUndo->AddNewBox( pBox->GetSttIdx() );
@@ -1490,7 +1490,7 @@ static SwTwips lcl_CalcWish( const SwLayoutFrame *pCell, long nWish,
 
     const bool bRTL = pCell->IsRightToLeft();
     SwTwips nRet = bRTL ?
-        nAct - pCell->Frame().Width() :
+        nAct - pCell->getSwFrame().Width() :
         0;
 
     while ( pTmp )
@@ -1608,12 +1608,12 @@ static void lcl_FindStartEndCol( const SwLayoutFrame *&rpStart,
 
     if ( pTab->GetTable()->IsNewModel() )
     {
-        nSX  = aRectFnSet.GetLeft(rpStart->Frame());
-        nSX2 = aRectFnSet.GetRight(rpStart->Frame());
+        nSX  = aRectFnSet.GetLeft(rpStart->getSwFrame());
+        nSX2 = aRectFnSet.GetRight(rpStart->getSwFrame());
     }
     else
     {
-        const SwTwips nPrtWidth = aRectFnSet.GetWidth(pTab->Prt());
+        const SwTwips nPrtWidth = aRectFnSet.GetWidth(pTab->getSwPrint());
         nSX = ::lcl_CalcWish( rpStart, nWish, nPrtWidth ) + aRectFnSet.GetPrtLeft(*pTab);
         nSX2 = nSX + (rpStart->GetFormat()->GetFrameSize().GetWidth() * nPrtWidth / nWish);
     }
@@ -1622,10 +1622,10 @@ static void lcl_FindStartEndCol( const SwLayoutFrame *&rpStart,
 
     while ( pTmp &&
             (!pTmp->IsCellFrame() ||
-             ( ( ! bRTL && aRectFnSet.GetLeft(pTmp->Frame()) < nSX &&
-                           aRectFnSet.GetRight(pTmp->Frame())< nSX2 ) ||
-               (   bRTL && aRectFnSet.GetLeft(pTmp->Frame()) > nSX &&
-                           aRectFnSet.GetRight(pTmp->Frame())> nSX2 ) ) ) )
+             ( ( ! bRTL && aRectFnSet.GetLeft(pTmp->getSwFrame()) < nSX &&
+                           aRectFnSet.GetRight(pTmp->getSwFrame())< nSX2 ) ||
+               (   bRTL && aRectFnSet.GetLeft(pTmp->getSwFrame()) > nSX &&
+                           aRectFnSet.GetRight(pTmp->getSwFrame())> nSX2 ) ) ) )
         pTmp = pTmp->GetNextLayoutLeaf();
 
     if ( pTmp )
@@ -1657,11 +1657,11 @@ static void lcl_FindStartEndCol( const SwLayoutFrame *&rpStart,
 
     if ( pTab->GetTable()->IsNewModel() )
     {
-        nEX = aRectFnSet.GetLeft(rpEnd->Frame());
+        nEX = aRectFnSet.GetLeft(rpEnd->getSwFrame());
     }
     else
     {
-        const SwTwips nPrtWidth = aRectFnSet.GetWidth(pTab->Prt());
+        const SwTwips nPrtWidth = aRectFnSet.GetWidth(pTab->getSwPrint());
         nEX = ::lcl_CalcWish( rpEnd, nWish, nPrtWidth ) + aRectFnSet.GetPrtLeft(*pTab);
     }
 
@@ -1674,8 +1674,8 @@ static void lcl_FindStartEndCol( const SwLayoutFrame *&rpStart,
     while( !rpEnd->IsCellFrame() )
         rpEnd = rpEnd->GetUpper();
 
-    while ( (   bRTL && aRectFnSet.GetLeft(rpEnd->Frame()) < nEX ) ||
-            ( ! bRTL && aRectFnSet.GetLeft(rpEnd->Frame()) > nEX ) )
+    while ( (   bRTL && aRectFnSet.GetLeft(rpEnd->getSwFrame()) < nEX ) ||
+            ( ! bRTL && aRectFnSet.GetLeft(rpEnd->getSwFrame()) > nEX ) )
     {
         const SwLayoutFrame* pTmpLeaf = rpEnd->GetPrevLayoutLeaf();
         if( !pTmpLeaf || !pTab->IsAnLower( pTmpLeaf ) )
@@ -1692,10 +1692,10 @@ static void lcl_FindStartEndCol( const SwLayoutFrame *&rpStart,
     {
         const SwLayoutFrame *pTmpLeaf = rpStart;
         pTmpLeaf = pTmpLeaf->GetNextLayoutLeaf();
-        while ( pTmpLeaf && aRectFnSet.GetLeft(pTmpLeaf->Frame()) > nEX ) // first skip line
+        while ( pTmpLeaf && aRectFnSet.GetLeft(pTmpLeaf->getSwFrame()) > nEX ) // first skip line
             pTmpLeaf = pTmpLeaf->GetNextLayoutLeaf();
-        while ( pTmpLeaf && aRectFnSet.GetLeft(pTmpLeaf->Frame()) < nSX &&
-                            aRectFnSet.GetRight(pTmpLeaf->Frame())< nSX2 )
+        while ( pTmpLeaf && aRectFnSet.GetLeft(pTmpLeaf->getSwFrame()) < nSX &&
+                            aRectFnSet.GetRight(pTmpLeaf->getSwFrame())< nSX2 )
             pTmpLeaf = pTmpLeaf->GetNextLayoutLeaf();
         const SwTabFrame *pTmpTab = rpStart->FindTabFrame();
         if ( !pTmpTab->IsAnLower( pTmpLeaf ) )
@@ -1703,8 +1703,8 @@ static void lcl_FindStartEndCol( const SwLayoutFrame *&rpStart,
             pTmpTab = pTmpTab->GetFollow();
             rpStart = pTmpTab->FirstCell();
             while ( rpStart &&
-                    aRectFnSet.GetLeft(rpStart->Frame()) < nSX &&
-                    aRectFnSet.GetRight(rpStart->Frame())< nSX2 )
+                    aRectFnSet.GetLeft(rpStart->getSwFrame()) < nSX &&
+                    aRectFnSet.GetRight(rpStart->getSwFrame())< nSX2 )
                 rpStart = rpStart->GetNextLayoutLeaf();
         }
         else
@@ -1714,9 +1714,9 @@ static void lcl_FindStartEndCol( const SwLayoutFrame *&rpStart,
     {
         const SwLayoutFrame *pTmpLeaf = rpEnd;
         pTmpLeaf = pTmpLeaf->GetPrevLayoutLeaf();
-        while ( pTmpLeaf && aRectFnSet.GetLeft(pTmpLeaf->Frame()) < nEX ) // skip the line for now
+        while ( pTmpLeaf && aRectFnSet.GetLeft(pTmpLeaf->getSwFrame()) < nEX ) // skip the line for now
             pTmpLeaf = pTmpLeaf->GetPrevLayoutLeaf();
-        while ( pTmpLeaf && aRectFnSet.GetLeft(pTmpLeaf->Frame()) > nEX )
+        while ( pTmpLeaf && aRectFnSet.GetLeft(pTmpLeaf->getSwFrame()) > nEX )
             pTmpLeaf = pTmpLeaf->GetPrevLayoutLeaf();
         const SwTabFrame *pTmpTab = rpEnd->FindTabFrame();
         if ( !pTmpLeaf || !pTmpTab->IsAnLower( pTmpLeaf ) )
@@ -1726,7 +1726,7 @@ static void lcl_FindStartEndCol( const SwLayoutFrame *&rpStart,
             rpEnd = pTmpTab->FindLastContent()->GetUpper();
             while( !rpEnd->IsCellFrame() )
                 rpEnd = rpEnd->GetUpper();
-            while ( aRectFnSet.GetLeft(rpEnd->Frame()) > nEX )
+            while ( aRectFnSet.GetLeft(rpEnd->getSwFrame()) > nEX )
                 rpEnd = rpEnd->GetPrevLayoutLeaf();
         }
         else
@@ -1765,12 +1765,12 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrame *pStart,
     else
     {
         SwRectFnSet aRectFnSet(pTable);
-        long nSttTop = aRectFnSet.GetTop(pStart->Frame());
-        long nEndTop = aRectFnSet.GetTop(pEnd->Frame());
+        long nSttTop = aRectFnSet.GetTop(pStart->getSwFrame());
+        long nEndTop = aRectFnSet.GetTop(pEnd->getSwFrame());
         if( nSttTop == nEndTop )
         {
-            if( aRectFnSet.GetLeft(pStart->Frame()) >
-                aRectFnSet.GetLeft(pEnd->Frame()) )
+            if( aRectFnSet.GetLeft(pStart->getSwFrame()) >
+                aRectFnSet.GetLeft(pEnd->getSwFrame()) )
                 bExchange = true;
         }
         else if( aRectFnSet.IsVert() == ( nSttTop < nEndTop ) )
@@ -1805,7 +1805,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrame *pStart,
     {
         SwRectFnSet aRectFnSet(pTable);
         const long nOfst = aRectFnSet.GetPrtLeft(*pTable);
-        const long nPrtWidth = aRectFnSet.GetWidth(pTable->Prt());
+        const long nPrtWidth = aRectFnSet.GetWidth(pTable->getSwPrint());
         long nSt1 = ::lcl_CalcWish( pStart, nWish, nPrtWidth ) + nOfst;
         long nEd1 = ::lcl_CalcWish( pEnd,   nWish, nPrtWidth ) + nOfst;
 
@@ -1817,13 +1817,13 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrame *pStart,
         long nSt2;
         long nEd2;
         if( pTable->IsAnLower( pStart ) )
-            nSt2 = aRectFnSet.GetTop(pStart->Frame());
+            nSt2 = aRectFnSet.GetTop(pStart->getSwFrame());
         else
-            nSt2 = aRectFnSet.GetTop(pTable->Frame());
+            nSt2 = aRectFnSet.GetTop(pTable->getSwFrame());
         if( pTable->IsAnLower( pEnd ) )
-            nEd2 = aRectFnSet.GetBottom(pEnd->Frame());
+            nEd2 = aRectFnSet.GetBottom(pEnd->getSwFrame());
         else
-            nEd2 = aRectFnSet.GetBottom(pTable->Frame());
+            nEd2 = aRectFnSet.GetBottom(pTable->getSwFrame());
         Point aSt, aEd;
         if( nSt1 > nEd1 )
         {
@@ -1862,7 +1862,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrame *pStart,
                                       pTable->GetFirstNonHeadlineRow() :
                                       static_cast<const SwLayoutFrame*>(pTable->Lower());
 
-            while ( pRow && !pRow->Frame().IsOver( aUnion ) )
+            while ( pRow && !pRow->getSwFrame().IsOver( aUnion ) )
                 pRow = static_cast<const SwLayoutFrame*>(pRow->GetNext());
 
             // #i31976#
@@ -1908,8 +1908,8 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrame *pStart,
 
             if ( pFirst && pLast ) //Robust
             {
-                aUnion = pFirst->Frame();
-                aUnion.Union( pLast->Frame() );
+                aUnion = pFirst->getSwFrame();
+                aUnion.Union( pLast->getSwFrame() );
             }
             else
                 aUnion.Width( 0 );
@@ -1978,7 +1978,7 @@ bool CheckSplitCells( const SwCursor& rCursor, sal_uInt16 nDiv,
 
         while ( pRow )
         {
-            if ( pRow->Frame().IsOver( rSelUnion.GetUnion() ) )
+            if ( pRow->getSwFrame().IsOver( rSelUnion.GetUnion() ) )
             {
                 const SwLayoutFrame *pCell = pRow->FirstCell();
 
@@ -1987,7 +1987,7 @@ bool CheckSplitCells( const SwCursor& rCursor, sal_uInt16 nDiv,
                     OSL_ENSURE( pCell->IsCellFrame(), "Frame without cell" );
                     if( ::IsFrameInTableSel( rSelUnion.GetUnion(), pCell ) )
                     {
-                        if( aRectFnSet.GetWidth(pCell->Frame()) < nMinValue )
+                        if( aRectFnSet.GetWidth(pCell->getSwFrame()) < nMinValue )
                             return false;
                     }