From 46cf9bb76b29f2bfa6639d9aaf4f26dee365bc0c Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Sep 2015 11:49:25 +0200 Subject: [PATCH] tdf#93097 oox: fix import of metadata from non-relative stream paths Commit ef2668bad976f1fbb70759887cafd35ea7833655 (PPTX import: fix missing document metadata, 2014-08-28) implemented metadata import for the PPTX filter, but in case the metadata stream is not an existing one, then OHierarchyHolder_Impl::GetListPathFromString() invoked by OStorage::openStreamElementByHierarchicalName() throws. The bugdoc is generated by a 3rd-party tool that always starts the stream path with a slash, and MSO seems to just ignore that: so let's do the same to be able to open the document. Change-Id: I6c0715adeb19b9055669f6a45055415dd2c44e28 --- oox/source/docprop/ooxmldocpropimport.cxx | 7 ++++++- sd/qa/unit/data/pptx/tdf93097.pptx | Bin 0 -> 29386 bytes sd/qa/unit/import-tests.cxx | 12 ++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 sd/qa/unit/data/pptx/tdf93097.pptx diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index c711f2f97de7..646c09c68437 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -80,8 +80,13 @@ Sequence< InputSource > lclGetRelatedStreams( const Reference< XStorage >& rxSto const StringPair& rEntry = rEntries[ nEntryIndex ]; if ( rEntry.First == "Target" ) { + // The stream path is always a relative one, ignore the leading "/" if it's there. + OUString aStreamPath = rEntry.Second; + if (aStreamPath.startsWith("/")) + aStreamPath = aStreamPath.copy(1); + Reference< XExtendedStorageStream > xExtStream( - xHierarchy->openStreamElementByHierarchicalName( rEntry.Second, ElementModes::READ ), UNO_QUERY_THROW ); + xHierarchy->openStreamElementByHierarchicalName( aStreamPath, ElementModes::READ ), UNO_QUERY_THROW ); Reference< XInputStream > xInStream = xExtStream->getInputStream(); if( xInStream.is() ) { diff --git a/sd/qa/unit/data/pptx/tdf93097.pptx b/sd/qa/unit/data/pptx/tdf93097.pptx new file mode 100644 index 0000000000000000000000000000000000000000..687110db3540c774120cc62741ce5af80f230829 GIT binary patch literal 29386 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 literal 0 HcmV?d00001 diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 7eb940372c02..68fe97051042 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -104,6 +104,7 @@ public: void testBnc910045(); void testRowHeight(); void testTdf93830(); + void testTdf93097(); CPPUNIT_TEST_SUITE(SdImportTest); @@ -144,6 +145,7 @@ public: CPPUNIT_TEST(testBnc910045); CPPUNIT_TEST(testRowHeight); CPPUNIT_TEST(testTdf93830); + CPPUNIT_TEST(testTdf93097); CPPUNIT_TEST_SUITE_END(); }; @@ -1224,6 +1226,16 @@ void SdImportTest::testTdf93830() xDocShRef->DoClose(); } +void SdImportTest::testTdf93097() +{ + // Throwing metadata import aborted the filter, check that metadata is now imported. + sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/tdf93097.pptx"), PPTX); + uno::Reference xDocumentPropertiesSupplier(xDocShRef->GetModel(), uno::UNO_QUERY); + uno::Reference xDocumentProperties = xDocumentPropertiesSupplier->getDocumentProperties(); + CPPUNIT_ASSERT_EQUAL(OUString("ss"), xDocumentProperties->getTitle()); + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest); CPPUNIT_PLUGIN_IMPLEMENT();