From fd0a49bdd7cf7979d18feff003d1b5fbe53fdc14 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 25 Sep 2014 21:06:40 +0200 Subject: Fix validation problems pointed out by CppunitTest_sd_export_tests Regression from e8bdd38882522591723097c028ca7a6927ee70c4 (fdo#83751-FILESAVE:Custom Properties dropped while exporting to .pptx, 2014-09-11), there were two problems here: 1) Using the wrong filter when the output is expected to be suitable for validation. 2) Writing empty custom property values, which is not valid. Change-Id: Ic18c789c53bd40cc8aa07385cb5fd0d5c7ada6ab --- oox/source/core/xmlfilterbase.cxx | 4 ++++ sd/qa/unit/sdmodeltestbase.hxx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index bf82eefbf779..001c9dbbd32e 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -713,6 +713,10 @@ writeCustomProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xP { if ( !aprop[n].Name.isEmpty() ) { + // Ignore empty string property as well. + if (aprop[n].Value.has() && aprop[n].Value.get().isEmpty()) + continue; + OString aName = OUStringToOString( aprop[n].Name, RTL_TEXTENCODING_ASCII_US ); // pid starts from 2 not from 1 as MS supports pid from 2 OString pid = OUStringToOString( OUString::number(n + 2), RTL_TEXTENCODING_ASCII_US ); diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx index e07e46f28e2a..b1472ce99236 100644 --- a/sd/qa/unit/sdmodeltestbase.hxx +++ b/sd/qa/unit/sdmodeltestbase.hxx @@ -56,7 +56,7 @@ FileFormat aFileFormats[] = { { "odp", "impress8", "impress8", "", ODP_FORMAT_TYPE }, { "ppt", "MS PowerPoint 97", "Microsoft PowerPoint 97/2000/XP/2003", "sdfilt", PPT_FORMAT_TYPE }, - { "pptx", "Impress MS PowerPoint 2007 XML", "MS PowerPoint 2007 XML", "", PPTX_FORMAT_TYPE }, + { "pptx", "Impress Office Open XML", "Office Open XML Presentation", "", PPTX_FORMAT_TYPE }, { "html", "graphic_HTML", "graphic_HTML", "", HTML_FORMAT_TYPE }, { 0, 0, 0, 0, 0 } }; -- cgit v1.2.3