diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-09-01 11:19:56 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-02 12:36:41 +0000 |
| commit | 52b29c60801cf75364fd8275a22e812797cb184d (patch) | |
| tree | 3943f82d250b0b8adeb6cb555edf58dd1c061285 /sw/qa | |
| parent | 91733eff7fba157daf88b092189d842f9d6f1b68 (diff) | |
tdf#76349 SpacingWithoutBorders: enable .doc RT
Microsoft allows spacing in textboxes even if the borders are not
shown, but LO does not. Added a compatible setting, used an existing
setting to allow the spacing, and changed .doc export not to zero
out the spacing if the border was zero-width.
Using the compatible setting in the export code is almost redundant,
but it does require that the document was LOADED as .doc, and not
"save as" from another format.
This patch simply allows round-tripping - any user attempt to modify the
border settings will enforce normal LO border rules.
Change-Id: I60ac036e1bfac381eea15e33c21495ad3800277a
Reviewed-on: https://gerrit.libreoffice.org/28601
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/qa')
| -rwxr-xr-x | sw/qa/extras/ww8export/data/tdf76349_textboxMargins.doc | bin | 0 -> 23552 bytes | |||
| -rw-r--r-- | sw/qa/extras/ww8export/ww8export.cxx | 6 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sw/qa/extras/ww8export/data/tdf76349_textboxMargins.doc b/sw/qa/extras/ww8export/data/tdf76349_textboxMargins.doc Binary files differnew file mode 100755 index 000000000000..95bc59807f94 --- /dev/null +++ b/sw/qa/extras/ww8export/data/tdf76349_textboxMargins.doc diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index f8fc27a5df69..7d3cf22131ec 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -734,6 +734,12 @@ DECLARE_WW8EXPORT_TEST(testTdf91083_tableKeep, "tdf91083_tableKeep.doc") CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xTable, "Split")); } +DECLARE_WW8EXPORT_TEST(testTdf76349_textboxMargins, "tdf76349_textboxMargins.doc") +{ + // textboxes without borders were losing their spacing items in round-tripping + CPPUNIT_ASSERT( 0 < parseDump("/root/page/body/txt/anchored/fly/infos/prtBounds", "left").toInt32() ); +} + DECLARE_WW8EXPORT_TEST(testMoveRange, "fdo66304-1.odt") { //the save must survive without asserting |