diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-07-04 18:27:52 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-07 07:18:02 +0000 |
| commit | 1127bed4d943036473dbbda6bcfae1ec0a23ed2e (patch) | |
| tree | cc2354289ae18f739989f5ca5d745e2640a2ba2c /sw | |
| parent | 048f298d9c87ec46c2415a1d23b87b20a1035cab (diff) | |
tdf#95367 inherit page style if no new one imported
CopyLastHeaderFooter doesn't do much good
if the previous section has blank stylenames.
(usually because of continuous section breaks).
Change-Id: Ida1e42ab0b650c7c43f06539b3cc058fe5c27919
Reviewed-on: https://gerrit.libreoffice.org/26911
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf95367_inheritFollowStyle.docx | bin | 0 -> 13861 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 5 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf95367_inheritFollowStyle.docx b/sw/qa/extras/ooxmlimport/data/tdf95367_inheritFollowStyle.docx Binary files differnew file mode 100644 index 000000000000..96d91ddcafcd --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf95367_inheritFollowStyle.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 4a50eacebda2..d94d3ce6170e 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -438,6 +438,11 @@ are on page 2 and page 3 CPPUNIT_ASSERT_EQUAL( OUString("two"), parseDump("/root/page[3]/body/txt/text()") ); } +DECLARE_OOXMLIMPORT_TEST(testTdf95367_inheritFollowStyle, "tdf95367_inheritFollowStyle.docx") +{ + CPPUNIT_ASSERT_EQUAL(OUString("header"), parseDump("/root/page[2]/header/txt/text()")); +} + DECLARE_OOXMLIMPORT_TEST(testN652364, "n652364.docx") { /* |