diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-06 08:23:20 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-01-18 22:53:26 +0100 |
| commit | ec16a47a8fbd663b13126bdb514bef48e8d1c073 (patch) | |
| tree | 9291635b29e76aff1d9c64e46a409e434c9f16d9 | |
| parent | b634f8d675b362e47fa555df7fb0cdeb5753f5b3 (diff) | |
tdf#92045 DOCX import: <w:effect w:val="none"/> 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.
(cherry picked from commit ac6bfd85df271b650dbd24b45391dac346ecd72c)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: Id61912e9c9458efc87e0a6f8e461663942c555f0
Reviewed-on: https://gerrit.libreoffice.org/21363
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit a31708d9df01e7eae5c9ca39f4ee82fd6644dfe6)
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf92045.docx | bin | 0 -> 12629 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf92045.docx b/sw/qa/extras/ooxmlimport/data/tdf92045.docx Binary files differnew file mode 100644 index 000000000000..d41f523c79b1 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf92045.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 043f7f4401e4..17849e340e70 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -2869,6 +2869,12 @@ DECLARE_OOXMLIMPORT_TEST(testTdf96674, "tdf96674.docx") CPPUNIT_ASSERT(aActualSize.Height > 0); } +DECLARE_OOXMLIMPORT_TEST(testTdf92045, "tdf92045.docx") +{ + // This was true, <w:effect w:val="none"/> resulted in setting the blinking font effect. + CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(getRun(getParagraph(1), 1), "CharFlash")); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 4b11157430c4..973151eb0558 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1625,7 +1625,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 )); |