diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-10 10:46:19 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-11 06:57:12 +0100 |
commit | 412ca1ff72d2031d327df658a94e63bdcb8583b0 (patch) | |
tree | 7f6b173d04d94967d6ac114c216a72e0e44a4940 /sw/source/core/doc/tblrwcl.cxx | |
parent | d5d8fa63282a433da9c49d811f04390b8d6ab9cc (diff) |
convert SwFrameSize to scoped enum
Change-Id: I7e1e641ff180035c7dcefdcfdd185eadbae32142
Reviewed-on: https://gerrit.libreoffice.org/84850
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/doc/tblrwcl.cxx')
-rw-r--r-- | sw/source/core/doc/tblrwcl.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index dd150db18b2a..3c701ffc52cb 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -1053,8 +1053,8 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn // Respect the Line's height, reset if needed SwFormatFrameSize aFSz( pInsLine->GetFrameFormat()->GetFrameSize() ); - if ( bSameHeight && ATT_VAR_SIZE == aFSz.GetHeightSizeType() ) - aFSz.SetHeightSizeType( ATT_MIN_SIZE ); + if ( bSameHeight && SwFrameSize::Variable == aFSz.GetHeightSizeType() ) + aFSz.SetHeightSizeType( SwFrameSize::Minimum ); bool bChgLineSz = 0 != aFSz.GetHeight() || bSameHeight; if ( bChgLineSz ) @@ -1196,7 +1196,7 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt ) aFindFrame.pNewFrameFormat = static_cast<SwTableBoxFormat*>(pSelBox->ClaimFrameFormat()); SwTwips nBoxSz = aFindFrame.pNewFrameFormat->GetFrameSize().GetWidth(); SwTwips nNewBoxSz = nBoxSz / ( nCnt + 1 ); - aFindFrame.pNewFrameFormat->SetFormatAttr( SwFormatFrameSize( ATT_VAR_SIZE, + aFindFrame.pNewFrameFormat->SetFormatAttr( SwFormatFrameSize( SwFrameSize::Variable, nNewBoxSz, 0 ) ); aFrameArr.insert( aFindFrame ); @@ -1206,7 +1206,7 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt ) // We have a remainder, so we need to define an own Format // for the last Box. pLastBoxFormat = new SwTableBoxFormat( *aFindFrame.pNewFrameFormat ); - pLastBoxFormat->SetFormatAttr( SwFormatFrameSize( ATT_VAR_SIZE, + pLastBoxFormat->SetFormatAttr( SwFormatFrameSize( SwFrameSize::Variable, nBoxSz - ( nNewBoxSz * nCnt ), 0 ) ); } aLastBoxArr.insert( aLastBoxArr.begin() + nFndPos, pLastBoxFormat ); @@ -1311,7 +1311,7 @@ static void lcl_CalcWidth( SwTableBox* pBox ) for( auto pTabBox : pLine->GetTabBoxes() ) nWidth += pTabBox->GetFrameFormat()->GetFrameSize().GetWidth(); - pFormat->SetFormatAttr( SwFormatFrameSize( ATT_VAR_SIZE, nWidth, 0 )); + pFormat->SetFormatAttr( SwFormatFrameSize( SwFrameSize::Variable, nWidth, 0 )); // Boxes with Lines can only have Size/Fillorder pFormat->ResetFormatAttr( RES_LR_SPACE, RES_FRMATR_END - 1 ); @@ -2931,10 +2931,10 @@ static void SetLineHeight( SwTableLine& rLine, SwTwips nOldHeight, SwTwips nNewH nMyNewH = long(aTmp); } - SwFrameSize eSize = ATT_MIN_SIZE; + SwFrameSize eSize = SwFrameSize::Minimum; if( !bMinSize && ( nMyOldH - nMyNewH ) > ( CalcRowRstHeight( pLineFrame ) + ROWFUZZY )) - eSize = ATT_FIX_SIZE; + eSize = SwFrameSize::Fixed; pFormat->SetFormatAttr( SwFormatFrameSize( eSize, 0, nMyNewH ) ); |