diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-04 11:49:25 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-09-17 20:42:54 +0200 |
commit | 1b635af9c337b929737d2ed807c9decc2ff6643b (patch) | |
tree | 5a93cce14f596df6044187c2cf6fb7b02b9c8bb5 | |
parent | 5e1a9eb3e6eecfbf34b81b786efb2427382a4f62 (diff) |
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.
(cherry picked from commit 46cf9bb76b29f2bfa6639d9aaf4f26dee365bc0c)
Conflicts:
sd/qa/unit/import-tests.cxx
Reviewed-on: https://gerrit.libreoffice.org/18372
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: I6c0715adeb19b9055669f6a45055415dd2c44e28
-rw-r--r-- | oox/source/docprop/ooxmldocpropimport.cxx | 7 | ||||
-rw-r--r-- | sd/qa/unit/data/pptx/tdf93097.pptx | bin | 0 -> 29386 bytes | |||
-rw-r--r-- | sd/qa/unit/import-tests.cxx | 12 |
3 files changed, 18 insertions, 1 deletions
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 Binary files differnew file mode 100644 index 000000000000..687110db3540 --- /dev/null +++ b/sd/qa/unit/data/pptx/tdf93097.pptx diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index b58aa3cda78d..6efcf1f071bd 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -102,6 +102,7 @@ public: #endif void testBnc910045(); void testTdf93830(); + void testTdf93097(); CPPUNIT_TEST_SUITE(SdImportTest); @@ -140,6 +141,7 @@ public: #endif CPPUNIT_TEST(testBnc910045); CPPUNIT_TEST(testTdf93830); + CPPUNIT_TEST(testTdf93097); CPPUNIT_TEST_SUITE_END(); }; @@ -1172,6 +1174,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<document::XDocumentPropertiesSupplier> xDocumentPropertiesSupplier(xDocShRef->GetModel(), uno::UNO_QUERY); + uno::Reference<document::XDocumentProperties> xDocumentProperties = xDocumentPropertiesSupplier->getDocumentProperties(); + CPPUNIT_ASSERT_EQUAL(OUString("ss"), xDocumentProperties->getTitle()); + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest); CPPUNIT_PLUGIN_IMPLEMENT(); |