diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-07-13 21:16:03 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-07-14 08:43:59 +0200 |
| commit | 92dc49a206dee0c157c57e5458a69365effa981f (patch) | |
| tree | c56e1afb0c3b9ddeab23ba3aae205b539204375f /sw | |
| parent | 09c852711983a5754a24facf88c2cf0be95e431d (diff) | |
tdf#109053: DOCX: Multipage table is not imported properly
An other use case when converting to a "floating table" is
not a good idea. In this case we can check whether next to
the table anything fits in the text area. If not then we
can avoid floating table conversion.
Reviewed-on: https://gerrit.libreoffice.org/39811
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit fc55711f01af172eb3a034454405fa941454c781)
Change-Id: I798a2f4c7a9dfe6aecbe4a73e3162b49ea5f0adc
Reviewed-on: https://gerrit.libreoffice.org/39929
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw')
| -rwxr-xr-x | sw/qa/extras/ooxmlimport/data/tdf109053.docx | bin | 0 -> 12195 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 8 |
2 files changed, 8 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf109053.docx b/sw/qa/extras/ooxmlimport/data/tdf109053.docx Binary files differnew file mode 100755 index 000000000000..f700c4d6a48d --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf109053.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 45ddf31920b4..891ed7e2d61f 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1348,6 +1348,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf108350, "tdf108350.docx") } + +DECLARE_OOXMLIMPORT_TEST(testTdf109053, "tdf109053.docx") +{ + // Table was imported into a text frame which led to a one page document + // Originally the table takes two pages, so Writer should import it accordingly. + CPPUNIT_ASSERT_EQUAL(getPages(), 2); +} + // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT CPPUNIT_PLUGIN_IMPLEMENT(); |