diff options
| -rw-r--r-- | sw/source/core/inc/sectfrm.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/calcmove.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/sectfrm.cxx | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index 93301964f56f..b5ddcd9480d4 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -129,7 +129,7 @@ public: * We need this in the FormatWidthCols to "deflate" columns there. */ SwTwips Undersize(bool bOverSize = false); - SwTwips Undersize() const; + SwTwips CalcUndersize() const; /// Adapt size to surroundings void _CheckClipping( bool bGrow, bool bMaximize ); diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 2ac5a3f12586..9469f2abe40c 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -664,7 +664,7 @@ size_t SwPageFrm::GetContentHeight(const long nTop, const long nBottom) const else if (pCnt->IsSctFrm()) { // Grow if undersized, but don't shrink if oversized. - const auto delta = static_cast<const SwSectionFrm*>(pCnt)->Undersize(); + const auto delta = static_cast<const SwSectionFrm*>(pCnt)->CalcUndersize(); if (delta > 0) nTmp += delta; } diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 1b3e9dd87077..00ffaec8a6f5 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -2492,7 +2492,7 @@ void SwSectionFrm::InvalidateFootnotePos() } } -SwTwips SwSectionFrm::Undersize() const +SwTwips SwSectionFrm::CalcUndersize() const { SWRECTFN(this); return InnerHeight() - (Prt().*fnRect->fnGetHeight)(); @@ -2500,8 +2500,7 @@ SwTwips SwSectionFrm::Undersize() const SwTwips SwSectionFrm::Undersize(bool bOverSize) { - SWRECTFN(this); - const auto nRet = InnerHeight() - (Prt().*fnRect->fnGetHeight)(); + const auto nRet = CalcUndersize(); m_bUndersized = (nRet > 0); return (nRet <= 0 && !bOverSize) ? 0 : nRet; } |