[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/data/tdf92045.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx     |    6 ++++++
 writerfilter/source/dmapper/DomainMapper.cxx |    2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 5e7f23292d8c67a65b86e6273b38e8310431ae20
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Jan 6 08:23:20 2016 +0100

    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)
    
    Change-Id: Id61912e9c9458efc87e0a6f8e461663942c555f0
    Reviewed-on: https://gerrit.libreoffice.org/21343
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/qa/extras/ooxmlimport/data/tdf92045.docx b/sw/qa/extras/ooxmlimport/data/tdf92045.docx
new file mode 100644
index 0000000..d41f523
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf92045.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index cfdbd7b5..ab8dabe 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -3012,6 +3012,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"));
+}
+
 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 07350c9..6d7eb17 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1633,7 +1633,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 ));