diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-10-05 23:09:25 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-10-10 10:34:28 +0200 |
| commit | 6c787e4a7a28d84b8a3f2ad5fa84d9d66ad4594e (patch) | |
| tree | 781cc07adffbe9b72b08c534b6a4a76fcea559e7 /sw/qa/extras | |
| parent | 44bac1d70b8f267fa4ac938078927ad9d79d64f2 (diff) | |
tdf#103025 sw: don't format header/footer in SwPageFrame::PreparePage()
This has always been dead code because it used wrong constants
FRMTYPE_HEADER|FRMTYPE_FOOTER which is actually Page|Column and
SwPageFrame and SwColumnFrame are not direct children of SwPageFrame.
Then commit 901e5c3a21a1299d10c44bc844246fe8c329bb82 fixed the
constants but somehow the early formatting of header/footer results
in wrong expansion of variable text fields, so just remove this code.
(cherry picked from commit f933da55797566cf725e35ab0df17e91c7d5598f)
Reviewed-on: https://gerrit.libreoffice.org/29558
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 63ba0dc9e12169e9a929231a01172c85fab2f628)
Change-Id: I0af13168970f26355a1b247e071235166d08b7a4
Diffstat (limited to 'sw/qa/extras')
| -rw-r--r-- | sw/qa/extras/odfimport/data/tdf103025.odt | bin | 0 -> 5694 bytes | |||
| -rw-r--r-- | sw/qa/extras/odfimport/odfimport.cxx | 9 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sw/qa/extras/odfimport/data/tdf103025.odt b/sw/qa/extras/odfimport/data/tdf103025.odt Binary files differnew file mode 100644 index 000000000000..bd1e57314d88 --- /dev/null +++ b/sw/qa/extras/odfimport/data/tdf103025.odt diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index 79dae52a8c52..3a8e2a5be216 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -631,6 +631,15 @@ DECLARE_ODFIMPORT_TEST(testBnc800714, "bnc800714.fodt") CPPUNIT_ASSERT(getProperty<bool>(getParagraph(2), "ParaKeepTogether")); } +DECLARE_ODFIMPORT_TEST(testTdf103025, "tdf103025.odt") +{ + CPPUNIT_ASSERT_EQUAL(OUString("2014-01"), parseDump("/root/page[1]/header/tab[2]/row[2]/cell[3]/txt/Special", "rText")); + CPPUNIT_ASSERT_EQUAL(OUString("2014-01"), parseDump("/root/page[2]/header/tab[2]/row[2]/cell[3]/txt/Special", "rText")); + CPPUNIT_ASSERT_EQUAL(OUString("2014-02"), parseDump("/root/page[3]/header/tab[2]/row[2]/cell[3]/txt/Special", "rText")); + CPPUNIT_ASSERT_EQUAL(OUString("2014-03"), parseDump("/root/page[4]/header/tab[2]/row[2]/cell[3]/txt/Special", "rText")); + CPPUNIT_ASSERT_EQUAL(OUString("2014-03"), parseDump("/root/page[5]/header/tab[2]/row[2]/cell[3]/txt/Special", "rText")); +} + DECLARE_ODFIMPORT_TEST(testTdf76322_columnBreakInHeader, "tdf76322_columnBreakInHeader.docx") { // column breaks were ignored. First line should start in column 2 |