diff options
| author | Justin Luth <justin.luth@collabora.com> | 2020-08-05 14:15:14 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-08-14 08:45:18 +0200 |
| commit | 6457d46967f8dbb41199b750d59edde839f24b5d (patch) | |
| tree | 5fa84e97f5f0414f2094d61ac84d7005e783db64 /sw/qa/extras/ww8export/ww8export3.cxx | |
| parent | b8285ae5133cd74df6930ada54bf12bdd22fce36 (diff) | |
tdf#132726 tdf#134948 doc/rtf export: don't PostponeWritingText
Since .doc and rtf don't postpone flys, they shouldn't also be
postponing the text.
Partially revert my LO 5.3 commits b39feae4f12b07a0fdb2c8c2a48d5aae613cd7c9/
3ade281c1da91b7646a56227cffba8eb8818ea30
which only avoided postponing within tables for the .doc format,
since this patch eliminates it completely for .doc and .rtf
I think the original Synerzip LO 4.4 patch
commit 80fd9fb7209cfd5c0622ee99d59e42e6db32f021
was only intended for DOCX formats.
I am concerned about doing this since the implications are unclear,
but I take comfort in seeing that many synerzip commits just
need to be reverted, and that a number of .doc bugs are
solved by doing this. The fact that few bug reports have
been made since 4.4 also suggests this isn't a hugely
active area. No intention to backport, and still lots of testing
time available for LO 7.1.
Change-Id: I9284d3cc516c480e8bb0848c17797988ffcdcd2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100175
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/qa/extras/ww8export/ww8export3.cxx')
| -rw-r--r-- | sw/qa/extras/ww8export/ww8export3.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx b/sw/qa/extras/ww8export/ww8export3.cxx index 2c6f4e1f0fe0..81dea2f98188 100644 --- a/sw/qa/extras/ww8export/ww8export3.cxx +++ b/sw/qa/extras/ww8export/ww8export3.cxx @@ -318,6 +318,20 @@ DECLARE_WW8EXPORT_TEST(testTdf120225_textControlCrossRef, "tdf120225_textControl CPPUNIT_ASSERT_EQUAL(OUString("Text1"), sTextFieldName); } +DECLARE_WW8EXPORT_TEST(testTdf134948, "tdf134948.odt") +{ + CPPUNIT_ASSERT_EQUAL_MESSAGE("Only 1 paragraph", 1, getParagraphs()); +} + +DECLARE_WW8EXPORT_TEST(testTdf132726, "tdf132726.odt") +{ + uno::Reference<text::XTextRange> xRun = getRun(getParagraph(1), 1, "What sentence has a yellow background? "); + CPPUNIT_ASSERT_EQUAL( COL_AUTO, Color(getProperty<sal_uInt32>(xRun, "CharBackColor")) ); + + xRun = getRun(getParagraph(1), 2, "Why, this sentence of course"); + CPPUNIT_ASSERT_EQUAL( COL_YELLOW, Color(getProperty<sal_uInt32>(xRun, "CharBackColor")) ); +} + DECLARE_WW8EXPORT_TEST(testTdf127316_autoEscapement, "tdf127316_autoEscapement.odt") { CPPUNIT_ASSERT_EQUAL(1, getPages()); |