diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-07-06 10:04:04 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-12 06:43:56 +0000 |
| commit | ecea3431ca761369d8180a74eba2877533050516 (patch) | |
| tree | b2460ab5852f586d71d6f6b46b67a0679825cc8d /sw/qa | |
| parent | 43bc09d6ddfafe4989f922ac2b41f0ac2bedc136 (diff) | |
tdf75573 docx - complete frames before starting alternate streams
An unused odd header was set to be discarded. The handling of
unregistered frames occurred at the same time, and thus ended up
being discarded as well.
Since a frame shouldn't encompass both the alternate stream
and the current stream, finalize any unfinished frames first.
Change-Id: Ie9123769724da461dd265936aa6b97de7f4dfbbc
Reviewed-on: https://gerrit.libreoffice.org/26972
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf75573_page1frame.docx | bin | 0 -> 29488 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 7 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf75573_page1frame.docx b/sw/qa/extras/ooxmlimport/data/tdf75573_page1frame.docx Binary files differnew file mode 100644 index 000000000000..d6bc29d36b06 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf75573_page1frame.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 4826c61b47e2..a1cefb0f8b06 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1732,6 +1732,13 @@ DECLARE_OOXMLIMPORT_TEST(testfdo76583, "fdo76583.docx") lcl_countTextFrames( mxComponent, 1 ); } +DECLARE_OOXMLIMPORT_TEST(testTdf75573, "tdf75573_page1frame.docx") +{ + // the problem was that an odd header was defined but not used, flagged as + // discardable, and then the unrelated frame was also discarded. + lcl_countTextFrames( mxComponent, 1 ); +} + DECLARE_OOXMLIMPORT_TEST(testFdo43093, "fdo43093.docx") { // The problem was that the direction and alignment are not correct for RTL paragraphs. |