From ac6bfd85df271b650dbd24b45391dac346ecd72c Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 6 Jan 2016 08:23:20 +0100 Subject: [PATCH] tdf#92045 DOCX import: doesn't mean blinking Regression from commit eeb8297e47bae11f2aeaa7bae6e51eee921e9e58 (Use constants for ST_TextEffect values, 2014-09-22), the problem was that while the tokenizer stopped using hardcoded token values, the matching dmapper code wasn't adapted. Change-Id: Id61912e9c9458efc87e0a6f8e461663942c555f0 --- sw/qa/extras/ooxmlimport/data/tdf92045.docx | Bin 0 -> 12629 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 6 ++++++ writerfilter/source/dmapper/DomainMapper.cxx | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 sw/qa/extras/ooxmlimport/data/tdf92045.docx diff --git a/sw/qa/extras/ooxmlimport/data/tdf92045.docx b/sw/qa/extras/ooxmlimport/data/tdf92045.docx new file mode 100644 index 0000000000000000000000000000000000000000..d41f523c79b12b3318c846576aee40a465ec1f68 GIT binary patch literal 12629 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 Vh5&{i000mCA^}D);oG0z{U2{!B9Q<9 literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 3ab0c83886bc..714704cb6544 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -3027,6 +3027,12 @@ DECLARE_OOXMLIMPORT_TEST(testTdf96674, "tdf96674.docx") CPPUNIT_ASSERT(aActualSize.Height > 0); } +DECLARE_OOXMLIMPORT_TEST(testTdf92045, "tdf92045.docx") +{ + // This was true, 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: */ diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index fb48b9a72800..d61818cc3898 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1653,7 +1653,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) case NS_ooxml::LN_EG_RPrBase_effect: // The file-format has many character animations. We have only // one, so we use it always. Suboptimal solution though. - if (nIntValue) + if (nIntValue != NS_ooxml::LN_Value_ST_TextEffect_none) rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( true )); else rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( false ));