Kaydet (Commit) 232885c6 authored tarafından Luke Deller's avatar Luke Deller Kaydeden (comit) Miklos Vajna

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.

Change-Id: I49cb00cef8b1d10120349073dee1511657dc84d1
Reviewed-on: https://gerrit.libreoffice.org/39851Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst b7ea55e6
......@@ -844,5 +844,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: */
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment