diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-13 19:01:12 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-13 19:23:41 +0200 |
| commit | 220a3686921847b71dc72b69ce98ba260b951610 (patch) | |
| tree | c10fc83c4abc99dd1685a7542f954ce9f6f3388c /sd/qa | |
| parent | 8b7f96d257724656ac4a4303b17285be2ed13886 (diff) | |
oox: refactor embedded media import
Currently the oox import creates a temp file and leaks it, and there is
no way to clean it up afterwards. Unfortunately it turns out that
SdrModel has no way to access the imported OOXML storage, so add a
really ugly hack to get the embedded media into the SdrMediaObj by
setting both MediaURL and PrivateStream properties (currently oox really
wants to set the properties in alphabetical order too...)
Change-Id: I5a235fbeb08e7bc17faf066de52b94867e9a79a2
Diffstat (limited to 'sd/qa')
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 21448253b39e..141db84478c1 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -808,6 +808,7 @@ void SdImportTest::testBnc591147() OUString sVideoURL("emptyURL"); bool bSucess = xPropSet->getPropertyValue("MediaURL") >>= sVideoURL; CPPUNIT_ASSERT_MESSAGE( "MediaURL property is not set", bSucess ); + CPPUNIT_ASSERT_MESSAGE("MediaURL is empty", !sVideoURL.isEmpty()); // Second page has audio file inserted xPage.set( xDoc->getDrawPages()->getByIndex(1), uno::UNO_QUERY_THROW ); @@ -818,6 +819,7 @@ void SdImportTest::testBnc591147() OUString sAudioURL("emptyURL"); bSucess = xPropSet->getPropertyValue("MediaURL") >>= sAudioURL; CPPUNIT_ASSERT_MESSAGE( "MediaURL property is not set", bSucess ); + CPPUNIT_ASSERT_MESSAGE("MediaURL is empty", !sAudioURL.isEmpty()); CPPUNIT_ASSERT_MESSAGE( "sAudioURL and sVideoURL should not be equal", sAudioURL != sVideoURL ); |