tdf#116411 fix Navigate By Page Next does not move the expected next

page into view

Uses newly introduced GetFirstLastVisPageNumbers function which does
not include pages having only visible bottom or top margins. This
solves the issue of pages with bottom margin remnants in the view
causing Page Next to not move the expected page into view.

Change-Id: Iec05f132b39e1db92be5d13c7d4cc41072dddac0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132373
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 54ad92ee5ae0..06cdc6ccfd2c 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -79,6 +79,14 @@ typedef std::shared_ptr<SwRootFrame> SwRootFramePtr;
 
 typedef struct _xmlTextWriter* xmlTextWriterPtr;
 
+struct SwVisiblePageNumbers
+{
+    sal_uInt16 nFirstPhy, nLastPhy;
+    sal_uInt16 nFirstVirt, nLastVirt;
+    OUString sFirstCustomPhy, sLastCustomPhy;
+    OUString sFirstCustomVirt, sLastCustomVirt;
+};
+
 class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell>
 {
     friend void SetOutDev( SwViewShell *pSh, OutputDevice *pOut );
@@ -573,6 +581,8 @@ public:
     bool isOutputToWindow() const;
     void OnGraphicArrived(const SwRect&);
 
+    void GetFirstLastVisPageNumbers(SwVisiblePageNumbers& rVisiblePageNumbers);
+
     virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };