summaryrefslogtreecommitdiffstats
path: root/sw/source/core/docnode/ndtbl1.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/docnode/ndtbl1.cxx')
-rw-r--r--sw/source/core/docnode/ndtbl1.cxx74
1 files changed, 37 insertions, 37 deletions
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 02390f41dff3..2fbfa06f7878 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -441,7 +441,7 @@ bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly )
SwFrame* pFrame = aIter.First();
while ( pFrame )
{
- nHeight = std::max( nHeight, pFrame->Frame().Height() );
+ nHeight = std::max( nHeight, pFrame->getSwFrame().Height() );
pFrame = aIter.Next();
}
}
@@ -536,7 +536,7 @@ static void lcl_CollectCells( std::vector<SwCellFrame*> &rArr, const SwRect &rUn
while ( !pCell->IsCellFrame() )
pCell = pCell->GetUpper();
OSL_ENSURE( pCell, "Frame is not a Cell" );
- if ( rUnion.IsOver( pCell->Frame() ) )
+ if ( rUnion.IsOver( pCell->getSwFrame() ) )
::InsertCell( rArr, static_cast<SwCellFrame*>(pCell) );
// Make sure the Cell is left (Areas)
@@ -643,17 +643,17 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
bool bTopOver, bLeftOver, bRightOver, bBottomOver;
if ( bVert )
{
- bTopOver = pCell->Frame().Right() >= rUnion.Right();
- bLeftOver = pCell->Frame().Top() <= rUnion.Top();
- bRightOver = pCell->Frame().Bottom() >= rUnion.Bottom();
- bBottomOver = pCell->Frame().Left() <= rUnion.Left();
+ bTopOver = pCell->getSwFrame().Right() >= rUnion.Right();
+ bLeftOver = pCell->getSwFrame().Top() <= rUnion.Top();
+ bRightOver = pCell->getSwFrame().Bottom() >= rUnion.Bottom();
+ bBottomOver = pCell->getSwFrame().Left() <= rUnion.Left();
}
else
{
- bTopOver = pCell->Frame().Top() <= rUnion.Top();
- bLeftOver = pCell->Frame().Left() <= rUnion.Left();
- bRightOver = pCell->Frame().Right() >= rUnion.Right();
- bBottomOver = pCell->Frame().Bottom() >= rUnion.Bottom();
+ bTopOver = pCell->getSwFrame().Top() <= rUnion.Top();
+ bLeftOver = pCell->getSwFrame().Left() <= rUnion.Left();
+ bRightOver = pCell->getSwFrame().Right() >= rUnion.Right();
+ bBottomOver = pCell->getSwFrame().Bottom() >= rUnion.Bottom();
}
if ( bRTL )
@@ -954,17 +954,17 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet )
bool bTopOver, bLeftOver, bRightOver, bBottomOver;
if ( bVert )
{
- bTopOver = pCell->Frame().Right() >= rUnion.Right();
- bLeftOver = pCell->Frame().Top() <= rUnion.Top();
- bRightOver = pCell->Frame().Bottom() >= rUnion.Bottom();
- bBottomOver = pCell->Frame().Left() <= rUnion.Left();
+ bTopOver = pCell->getSwFrame().Right() >= rUnion.Right();
+ bLeftOver = pCell->getSwFrame().Top() <= rUnion.Top();
+ bRightOver = pCell->getSwFrame().Bottom() >= rUnion.Bottom();
+ bBottomOver = pCell->getSwFrame().Left() <= rUnion.Left();
}
else
{
- bTopOver = pCell->Frame().Top() <= rUnion.Top();
- bLeftOver = pCell->Frame().Left() <= rUnion.Left();
- bRightOver = pCell->Frame().Right() >= rUnion.Right();
- bBottomOver = pCell->Frame().Bottom() >= rUnion.Bottom();
+ bTopOver = pCell->getSwFrame().Top() <= rUnion.Top();
+ bLeftOver = pCell->getSwFrame().Left() <= rUnion.Left();
+ bRightOver = pCell->getSwFrame().Right() >= rUnion.Right();
+ bBottomOver = pCell->getSwFrame().Bottom() >= rUnion.Bottom();
}
if ( bRTL )
@@ -1275,20 +1275,20 @@ static sal_uInt16 lcl_CalcCellFit( const SwLayoutFrame *pCell )
SwRectFnSet aRectFnSet(pCell);
while ( pFrame )
{
- const SwTwips nAdd = aRectFnSet.GetWidth(pFrame->Frame()) -
- aRectFnSet.GetWidth(pFrame->Prt());
+ const SwTwips nAdd = aRectFnSet.GetWidth(pFrame->getSwFrame()) -
+ aRectFnSet.GetWidth(pFrame->getSwPrint());
// pFrame does not necessarily have to be a SwTextFrame!
const SwTwips nCalcFitToContent = pFrame->IsTextFrame() ?
const_cast<SwTextFrame*>(static_cast<const SwTextFrame*>(pFrame))->CalcFitToContent() :
- aRectFnSet.GetWidth(pFrame->Prt());
+ aRectFnSet.GetWidth(pFrame->getSwPrint());
nRet = std::max( nRet, nCalcFitToContent + nAdd );
pFrame = pFrame->GetNext();
}
// Surrounding border as well as left and Right Border also need to be respected
- nRet += aRectFnSet.GetWidth(pCell->Frame()) -
- aRectFnSet.GetWidth(pCell->Prt());
+ nRet += aRectFnSet.GetWidth(pCell->getSwFrame()) -
+ aRectFnSet.GetWidth(pCell->getSwPrint());
// To compensate for the accuracy of calculation later on in SwTable::SetTabCols
// we keep adding up a little.
@@ -1315,7 +1315,7 @@ static void lcl_CalcSubColValues( std::vector<sal_uInt16> &rToFill, const SwTabC
{
const sal_uInt16 nWish = bWishValues ?
::lcl_CalcCellFit( pCell ) :
- MINLAY + sal_uInt16(pCell->Frame().Width() - pCell->Prt().Width());
+ MINLAY + sal_uInt16(pCell->getSwFrame().Width() - pCell->getSwPrint().Width());
SwRectFnSet aRectFnSet(pTab);
@@ -1327,14 +1327,14 @@ static void lcl_CalcSubColValues( std::vector<sal_uInt16> &rToFill, const SwTabC
nColRight += rCols.GetLeftMin();
// Adapt values to the proportions of the Table (Follows)
- if ( rCols.GetLeftMin() != aRectFnSet.GetLeft(pTab->Frame()) )
+ if ( rCols.GetLeftMin() != aRectFnSet.GetLeft(pTab->getSwFrame()) )
{
- const long nDiff = aRectFnSet.GetLeft(pTab->Frame()) - rCols.GetLeftMin();
+ const long nDiff = aRectFnSet.GetLeft(pTab->getSwFrame()) - rCols.GetLeftMin();
nColLeft += nDiff;
nColRight += nDiff;
}
- const long nCellLeft = aRectFnSet.GetLeft(pCell->Frame());
- const long nCellRight = aRectFnSet.GetRight(pCell->Frame());
+ const long nCellLeft = aRectFnSet.GetLeft(pCell->getSwFrame());
+ const long nCellRight = aRectFnSet.GetRight(pCell->getSwFrame());
// Calculate overlapping value
long nWidth = 0;
@@ -1344,9 +1344,9 @@ static void lcl_CalcSubColValues( std::vector<sal_uInt16> &rToFill, const SwTabC
nWidth = nCellRight - nColLeft;
else if ( nColLeft >= nCellLeft && nColRight <= nCellRight )
nWidth = nColRight - nColLeft;
- if ( nWidth && pCell->Frame().Width() )
+ if ( nWidth && pCell->getSwFrame().Width() )
{
- long nTmp = nWidth * nWish / pCell->Frame().Width();
+ long nTmp = nWidth * nWish / pCell->getSwFrame().Width();
if ( sal_uInt16(nTmp) > rToFill[i] )
rToFill[i] = sal_uInt16(nTmp);
}
@@ -1394,8 +1394,8 @@ static void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols
{
if ( pCell->IsCellFrame() && pCell->FindTabFrame() == pTab && ::IsFrameInTableSel( rUnion, pCell ) )
{
- const long nCLeft = aRectFnSet.GetLeft(pCell->Frame());
- const long nCRight = aRectFnSet.GetRight(pCell->Frame());
+ const long nCLeft = aRectFnSet.GetLeft(pCell->getSwFrame());
+ const long nCRight = aRectFnSet.GetRight(pCell->getSwFrame());
bool bNotInCols = true;
@@ -1418,9 +1418,9 @@ static void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols
// Adapt values to the proportions of the Table (Follows)
long nLeftA = nColLeft;
long nRightA = nColRight;
- if ( rCols.GetLeftMin() != sal_uInt16(aRectFnSet.GetLeft(pTab->Frame())) )
+ if ( rCols.GetLeftMin() != sal_uInt16(aRectFnSet.GetLeft(pTab->getSwFrame())) )
{
- const long nDiff = aRectFnSet.GetLeft(pTab->Frame()) - rCols.GetLeftMin();
+ const long nDiff = aRectFnSet.GetLeft(pTab->getSwFrame()) - rCols.GetLeftMin();
nLeftA += nDiff;
nRightA += nDiff;
}
@@ -1436,8 +1436,8 @@ static void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols
nFit = nWish;
}
else
- { const sal_uInt16 nMin = MINLAY + sal_uInt16(pCell->Frame().Width() -
- pCell->Prt().Width());
+ { const sal_uInt16 nMin = MINLAY + sal_uInt16(pCell->getSwFrame().Width() -
+ pCell->getSwPrint().Width());
if ( !nFit || nMin < nFit )
nFit = nMin;
}
@@ -1450,7 +1450,7 @@ static void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols
}
do {
pCell = pCell->GetNextLayoutLeaf();
- } while( pCell && pCell->Frame().Width() == 0 );
+ } while( pCell && pCell->getSwFrame().Width() == 0 );
} while ( pCell && pTab->IsAnLower( pCell ) );
}
}
generated by cgit (git 2.34.1) at 2024-05-14 07:02:23 +0000