diff options
| author | Rohit Deshmukh <rohit.deshmukh@synerzip.com> | 2014-05-08 16:33:44 +0530 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-05-14 15:03:50 +0200 |
| commit | ba4b62e10924f43136c8ce048ce8504b44c5ec61 (patch) | |
| tree | 02c6bfaa305ead042b46b441b570510e56ec12fe /sw/qa | |
| parent | d9c0280d4b785d07c220bfd029c2949227b8f398 (diff) | |
fdo#78384: Fix for corruption if file contains symbols.
* In case of symbol, symbol character get imported first and then font of symbols.
* So we are storing symbol character and when we parse symbol font then create UNO object for text.
Reviewed-on: https://gerrit.libreoffice.org/9281
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit f51640c5f40d5132b396a9fb6589420383df1610)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
Change-Id: If5b79521c6a59aec02b165e8120dafdd472cdaeb
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/fdo78384.docx | bin | 0 -> 13134 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 7 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78384.docx b/sw/qa/extras/ooxmlexport/data/fdo78384.docx Binary files differnew file mode 100644 index 000000000000..ee102648f16b --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/fdo78384.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 7095ea23dc8b..ee5f974e38e2 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2048,6 +2048,13 @@ DECLARE_OOXMLEXPORT_TEST(testFdo71785, "fdo71785.docx") // crashtest } +DECLARE_OOXMLEXPORT_TEST(testFDO78384,"fdo78384.docx") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w:rFonts","ascii","Wingdings"); +} #endif CPPUNIT_PLUGIN_IMPLEMENT(); |