From 377115804894411b10de93a6e53704ba468a9add Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Wed, 6 Jul 2016 10:04:04 +0300 Subject: 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 Reviewed-by: Miklos Vajna (cherry picked from commit ecea3431ca761369d8180a74eba2877533050516) --- sw/qa/extras/ooxmlimport/data/tdf75573_page1frame.docx | Bin 0 -> 29488 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 7 +++++++ 2 files changed, 7 insertions(+) create mode 100644 sw/qa/extras/ooxmlimport/data/tdf75573_page1frame.docx (limited to 'sw/qa') diff --git a/sw/qa/extras/ooxmlimport/data/tdf75573_page1frame.docx b/sw/qa/extras/ooxmlimport/data/tdf75573_page1frame.docx new file mode 100644 index 000000000000..d6bc29d36b06 Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf75573_page1frame.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 281ae83f6da9..c3c4728c3763 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1740,6 +1740,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. -- cgit