diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-03-08 12:24:48 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-08 13:36:24 +0100 |
| commit | 11c916bf87aac524fa1a833328dc6b7c99a138e4 (patch) | |
| tree | 2cb820e30a5a973782a577977cdd47d82b8b4d91 /sd | |
| parent | f11693d5f99bbb8c9ebcd407bc3b13f05bdbd075 (diff) | |
oox customXml: Don't write the Relationship to DOCX files twice.
Change-Id: Id3da40138e86c142707e377aa897df372aacb704
Reviewed-on: https://gerrit.libreoffice.org/50943
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml1.cxx | 4 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index 9147c662c634..64d2443f37bf 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -822,8 +822,8 @@ void SdOOXMLExportTest1::testCustomXml() CPPUNIT_ASSERT(pRelsDoc); // Check there is a relation to itemProps1.xml. - const OUString sXmlPath = "/rels:Relationships/rels:Relationship[@Id='rId1']"; - assertXPath(pRelsDoc, OUStringToOString(sXmlPath, RTL_TEXTENCODING_UTF8), "Target", "itemProps1.xml"); + assertXPath(pRelsDoc, "/rels:Relationships/rels:Relationship", 1); + assertXPath(pRelsDoc, "/rels:Relationships/rels:Relationship[@Id='rId1']", "Target", "itemProps1.xml"); std::shared_ptr<SvStream> pStream = parseExportStream(tempFile, "ddp/ddpfile.xen"); CPPUNIT_ASSERT(pStream); diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 9d6f3066b7e9..c977471aaaa8 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -349,9 +349,9 @@ void PowerPointExport::writeDocumentProperties() uno::Reference<document::XDocumentProperties> xDocProps = xDPS->getDocumentProperties(); if (xDocProps.is()) - { - exportDocumentProperties( xDocProps ); - } + exportDocumentProperties(xDocProps); + + exportCustomFragments(); } bool PowerPointExport::importDocument() throw() |