diff options
author | Luke Deller <luke@deller.id.au> | 2017-09-04 22:40:34 +1000 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-09-13 21:31:29 +0200 |
commit | 342a65bdb3ca3db19eb6b1244b6f866a0e526a86 (patch) | |
tree | 278eb1f22d665fe6e6685ebe0c083266766f4927 | |
parent | 6b9470405f63e169ce9098797213c4520f053811 (diff) |
tdf#94882 use first page header on first page
The very first page of the document should always be formatted using
the "first page" settings in the page style, regardless of the page
number set for that page.
(cherry picked from commit 232885c66422ab8f05d86cfeac9b377a97462ae4)
Change-Id: I49cb00cef8b1d10120349073dee1511657dc84d1
Reviewed-on: https://gerrit.libreoffice.org/41892
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r-- | sw/qa/extras/odfimport/data/tdf94882.odt | bin | 0 -> 9704 bytes | |||
-rw-r--r-- | sw/qa/extras/odfimport/odfimport.cxx | 13 | ||||
-rw-r--r-- | sw/source/core/layout/newfrm.cxx | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/sw/qa/extras/odfimport/data/tdf94882.odt b/sw/qa/extras/odfimport/data/tdf94882.odt Binary files differnew file mode 100644 index 000000000000..2aacb9836da2 --- /dev/null +++ b/sw/qa/extras/odfimport/data/tdf94882.odt diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index 2439334ea512..9f871c08ea4e 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -837,5 +837,18 @@ DECLARE_ODFIMPORT_TEST(testTdf109228, "tdf109228.odt") CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AS_CHARACTER, getProperty<text::TextContentAnchorType>(getShape(1), "AnchorType")); } +DECLARE_ODFIMPORT_TEST(testTdf94882, "tdf94882.odt") +{ + // Get the header of the page containing our content + // (done this way to skip past any blank page inserted before it + // due to the page number being even) + OUString headertext = parseDump( + "/root/page[starts-with(body/txt/text(),'The paragraph style on this')]" + "/header/txt/text()" + ); + // This header should be the first page header + CPPUNIT_ASSERT_EQUAL(OUString("This is the first page header"), headertext); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index dae63d1f8aa6..ee4674b54c40 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -538,7 +538,7 @@ void SwRootFrame::Init( SwFrameFormat* pFormat ) if ( !pDesc ) pDesc = &pDoc->GetPageDesc( 0 ); const bool bOdd = !oPgNum || 0 != ( oPgNum.get() % 2 ); - bool bFirst = !oPgNum || 1 == oPgNum.get(); + const bool bFirst = true; // Create a page and put it in the layout SwPageFrame *pPage = ::InsertNewPage( *pDesc, this, bOdd, bFirst, false, false, nullptr ); |