DOCX import: fix lost page break when footer ends with a table

Regression from commit 7d3778e0ef9f54f3c8988f1b84d58e7002d6c625
(bnc#816593 DOCX import: ignore page breaks in tables, 2013-09-02), the
page break was ignored because the preceding footer ended with a table
(no empty paragraph at the end of the footer stream).

Fix the problem by saving/loading the table state around header/footers,
that way the page break is not ignored.

Adjust testTdf102466 to test the page number from Word.

Change-Id: Ia4c22452ee2c37f7f941dfd922db04c851644d0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86435
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

1 files changed, 4 insertions, 1 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index b050e95b66c5..2691bbf659d6 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -140,9 +140,12 @@ enum class SkipFootnoteSeparator
 class HeaderFooterContext
 {
     bool const m_bTextInserted;
+    sal_Int32 m_nTableDepth;
+
 public:
-    explicit HeaderFooterContext(bool bTextInserted);
+    explicit HeaderFooterContext(bool bTextInserted, sal_Int32 nTableDepth);
     bool getTextInserted() const;
+    sal_Int32 getTableDepth() const;
 };
 
 /// Information about a paragraph to be finished after a field end.