master build fails, presumably due to fix for tdf90681

[Jean-Baptiste Faure]

Hi,

My master build (Ubuntu 14.10 x86-64) fails with the following error:

tablePreferredWidth.docx,303
File tested,Execution Time (ms)
tdf90681.odt,[...]/LibO/master/test/source/xmltesttools.cxx:70:testOldComplexMerge::Import_Export_Import
equality assertion failed
- Expected: 1
- Actual  : 0
- In <file://[...]/LibO/tmp/lumuytop.tmp>, XPath '//w:vMerge[4]' number
of nodes is incorrect

I tried with a complete rebuild with the same error.
OS :

I guess the problem is in this commit:
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=9657455d985ecce30c4e9d3d799212e7cc8aa57a
in which the file tdf90681.odt is referenced.

Best regards.
JBF
-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.