mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#92045 DOCX import: <w:effect w:val="none"/> doesn't mean blinking

Browse Source 
Regression from commit eeb8297e47 (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
This commit is contained in:
Miklos Vajna
2016-01-06 08:23:20 +01:00
parent a30a36b3c7
commit ac6bfd85df
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sw/qa/extras/ooxmlimport/data/tdf92045.docx Normal file
View File

Binary file not shown.

6
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
View File

@@ -3027,6 +3027,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: */

2
writerfilter/source/dmapper/DomainMapper.cxx
View File

@@ -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 ));