summaryrefslogtreecommitdiff
path: root/sw/qa
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2020-05-28 10:41:58 +0300
committerMiklos Vajna <vmiklos@collabora.com>2020-05-29 18:05:58 +0200
commit4efeee09bce9835f587ea7d1577471768bf73e2d (patch)
tree43d2d055ea3acad266f12d4150d8e3282f7bffa4 /sw/qa
parentce26772839f4c738f4e5aef45a02ddf281496698 (diff)
tdf#133453 doc import: HasSprm can return last one
The last sprm is the one that takes effect in the rare cases of duplicate SPRMs defined, so at least have an option to return that one as the matching value. Unfortunately, that seems to have been ignored in the last 20+ years of .doc support. So I added it carefully and only enabled finding the last SPRM in the specific case I was dealing with. However, I expect it should ~always be true, so perhaps I will followup with a patch looking for examples of duplicate/different SPRMs defined. Change-Id: I5539aa3d6117380cd6d852ca165d40c7c7f3c330 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95013 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/qa')
-rw-r--r--sw/qa/extras/ww8export/data/tdf133453_realFontSize.docbin0 -> 10752 bytes
-rw-r--r--sw/qa/extras/ww8export/ww8export3.cxx5
2 files changed, 5 insertions, 0 deletions
diff --git a/sw/qa/extras/ww8export/data/tdf133453_realFontSize.doc b/sw/qa/extras/ww8export/data/tdf133453_realFontSize.doc
new file mode 100644
index 000000000000..6fa50368087e
--- /dev/null
+++ b/sw/qa/extras/ww8export/data/tdf133453_realFontSize.doc
Binary files differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx b/sw/qa/extras/ww8export/ww8export3.cxx
index 12a939eb6d31..96547e30133a 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -312,6 +312,11 @@ DECLARE_WW8EXPORT_TEST(testTdf120412_proportionalEscapement, "tdf120412_proporti
CPPUNIT_ASSERT_EQUAL(2, getPages());
}
+DECLARE_WW8EXPORT_TEST(testTdf133453_realFontSize, "tdf133453_realFontSize.doc")
+{
+ CPPUNIT_ASSERT_EQUAL( -95.f, getProperty<float>(getRun(getParagraph(1), 2, "2"), "CharEscapement") );
+}
+
DECLARE_WW8EXPORT_TEST(testTdf121111_fillStyleNone, "tdf121111_fillStyleNone.docx")
{
uno::Reference<beans::XPropertySet> xStyle(getStyles("ParagraphStyles")->getByName("Numbering - First level"),