From 26217b01d5630ddf63c60b4400d3a58d3c0dd789 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 9 Dec 2016 16:27:30 +0100 Subject: tdf#103925 RTF import: fix handling of \animtext0 Since commit ac6bfd85df271b650dbd24b45391dac346ecd72c (tdf#92045 DOCX import: doesn't mean blinking, 2016-01-06) the "no blink" blink type is not 0, but NS_ooxml::LN_Value_ST_TextEffect_none. (cherry picked from commit c260580daa4fe78093265c1359c4d54677d76470) Change-Id: If854e57d125a365f829797f027ca5e131705e137 Reviewed-on: https://gerrit.libreoffice.org/31899 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- sw/qa/extras/rtfexport/data/tdf103925.rtf | 1 + sw/qa/extras/rtfexport/rtfexport.cxx | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 sw/qa/extras/rtfexport/data/tdf103925.rtf (limited to 'sw') diff --git a/sw/qa/extras/rtfexport/data/tdf103925.rtf b/sw/qa/extras/rtfexport/data/tdf103925.rtf new file mode 100644 index 000000000000..91183fafea0c --- /dev/null +++ b/sw/qa/extras/rtfexport/data/tdf103925.rtf @@ -0,0 +1 @@ +{\rtf1 \animtext0 This is not blinking.\par } diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index 37e9ba71a099..84496ac2c775 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -1111,6 +1111,12 @@ DECLARE_RTFEXPORT_TEST(testTdf61901, "tdf61901.rtf") } } +DECLARE_RTFEXPORT_TEST(testTdf103925, "tdf103925.rtf") +{ + // This was true, \animtext0 resulted in setting the blinking font effect. + CPPUNIT_ASSERT_EQUAL(false, getProperty(getRun(getParagraph(1), 1), "CharFlash")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit