SwPageFrm::MakeAll Refactored

Browser and Hide Whitespace page height now use
SwPageFrm::GetContentHeight, which is const.

A few improvements are done for both paths as well.

Change-Id: I73a8e920ccfa96d76cbbb002bed6a85f2e636ede
Reviewed-on: https://gerrit.libreoffice.org/19730
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index 3abdd37de9fe..93301964f56f 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -116,15 +116,20 @@ public:
     bool CalcMinDiff( SwTwips& rMinDiff ) const;
 
     /**
-     * If we don't pass a @param bOverSize or false, the return value is > 0 for
-     * undersized Frames, or 0
+     * Returns the size delta that the section would like to be
+     * greater if it has undersized TextFrms in it.
      *
+     * If we don't pass a @param bOverSize or false, the return value
+     * is > 0 for undersized Frames, or 0 otherwise.
      * If @param bOverSize == true, we can also get a negative return value,
      * if the SectionFrm is not completely filled, which happens often for
      * e.g. SectionFrms with Follows.
+     *
+     * If necessary the undersized-flag is corrected.
      * We need this in the FormatWidthCols to "deflate" columns there.
      */
-    long Undersize( bool bOverSize = false );
+    SwTwips Undersize(bool bOverSize = false);
+    SwTwips Undersize() const;
 
     /// Adapt size to surroundings
     void _CheckClipping( bool bGrow, bool bMaximize );