From cc46e7b9c75ddbcaaefde5f396ba76b0b866fa58 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Wed, 13 Jun 2018 15:53:49 +0200 Subject: tdf#116537: use page #s excluding empty pages when they are ignored Since commit 3c1a343f6936f1dcefdf79a677f8c26ce29676e6, SwDoc::CalculatePagesForPrinting expects that PageRange contains page numbers that don't include empty pages' numbers, when the org.openoffice.Office.Writer/Print/EmptyPages is false. Change-Id: I4057d6e36765707affbd5f3a4507ae03f4a27171 Reviewed-on: https://gerrit.libreoffice.org/55756 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- sw/inc/crsrsh.hxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sw/inc/crsrsh.hxx') diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 98a83f08b1f2..531452561fe9 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -512,6 +512,9 @@ public: // false: which is visible at the upper margin. void GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum, bool bAtCursorPos = true, const bool bCalcFrame = true ); + // Returns current page's sequential number (1-based), ignoring autoinserted empty pages + // Returns 0 on error + sal_uInt16 GetPageNumSeqNonEmpty(bool bAtCursorPos, bool bCalcFrame); // Determine how "empty pages" are handled // (used in PhyPage). sal_uInt16 GetNextPrevPageNum( bool bNext = true ); -- cgit