diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-12-22 06:22:45 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-01-08 15:09:46 +0100 |
| commit | 591e4216a4f9dea0bc29ce8fc93a77c8f1e45bdf (patch) | |
| tree | 37e61cf00c1d7065ec32d1194a7f46039aafbdac /sc | |
| parent | bf8e0a17eae89e6228350d99826657f56cc0845c (diff) | |
fix another validation error for OOXML, related fdo#40746
e.g. exporting fdo40746-2.ods as OOXML
Change-Id: I8a19ec2caecbc3687229d820ac2ec11fc01facd1
Reviewed-on: https://gerrit.libreoffice.org/13590
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 62bc15f270614afa37c6615fc34cd79f45026da5)
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xelink.cxx | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 3de8363fc9d6..08b2afbf73dd 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -242,7 +242,7 @@ protected: /** Writes the list of externalName elements. */ void WriteExtNameBufferXml( XclExpXmlStream& rStrm ); -private: +protected: typedef boost::shared_ptr< XclExpExtNameBuffer > XclExpExtNameBfrRef; XclExpExtNameBfrRef mxExtNameBfr; /// List of EXTERNNAME records. }; @@ -1684,14 +1684,18 @@ void XclExpSupbook::SaveXml( XclExpXmlStream& rStrm ) } - pExternalLink->startElement( XML_sheetDataSet, FSEND); + if (!maXctList.IsEmpty() || mxExtNameBfr) + { + pExternalLink->startElement( XML_sheetDataSet, FSEND); - // sheetData elements - maXctList.SaveXml( rStrm ); - // externalName elements - WriteExtNameBufferXml( rStrm ); + // sheetData elements + maXctList.SaveXml( rStrm ); + // externalName elements + WriteExtNameBufferXml( rStrm ); - pExternalLink->endElement( XML_sheetDataSet); + pExternalLink->endElement( XML_sheetDataSet); + + } pExternalLink->endElement( XML_externalBook); pExternalLink->endElement( XML_externalLink); } |