diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-16 12:24:48 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-16 13:37:47 +0200 |
| commit | 1fa8ae83323320967a56f92766aca4a3925b6514 (patch) | |
| tree | 914bc84091b76aeeda1caa4e6f76272e15939864 /sd | |
| parent | b99a8af33f6a349225efe489507c848f89d8fd13 (diff) | |
glTF export: Use plural folder names
Change-Id: If17628395ede512c00b666efc5511d9711edfb5a
(cherry picked from commit 9ee69cbd6f1143160aa96001462b933770cc6b76)
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/data/media_embedding.odp | bin | 4068415 -> 4068488 bytes | |||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sd/qa/unit/data/media_embedding.odp b/sd/qa/unit/data/media_embedding.odp Binary files differindex b27bbaef8cb4..d8af1ecd34b1 100644 --- a/sd/qa/unit/data/media_embedding.odp +++ b/sd/qa/unit/data/media_embedding.odp diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 04af6250b49e..0f813a92e984 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -727,7 +727,7 @@ void SdFiltersTest::testMediaEmbedding() // First object is a glTF model SdrMediaObj *pModelObj = dynamic_cast<SdrMediaObj*>( pPage->GetObj( 2 )); CPPUNIT_ASSERT_MESSAGE( "missing model", pModelObj != NULL); - CPPUNIT_ASSERT_EQUAL( OUString( "vnd.sun.star.Package:Model/jeep/jeep.json" ), pModelObj->getMediaProperties().getURL()); + CPPUNIT_ASSERT_EQUAL( OUString( "vnd.sun.star.Package:Models/jeep/jeep.json" ), pModelObj->getMediaProperties().getURL()); CPPUNIT_ASSERT_EQUAL( OUString( "model/vnd.gltf+json" ), pModelObj->getMediaProperties().getMimeType()); // Check the case when experimental mode is disabled @@ -743,7 +743,7 @@ void SdFiltersTest::testMediaEmbedding() // If glTF is not supported, then the fallback image is imported SdrGrafObj *pGrafic = dynamic_cast<SdrGrafObj*>( pPage->GetObj( 2 )); CPPUNIT_ASSERT_MESSAGE( "Could not load glTF fallback image", pGrafic != NULL); - CPPUNIT_ASSERT_EQUAL( OUString( "vnd.sun.star.Package:Model/Fallback/jeep.png" ), pGrafic->GetGrafStreamURL()); + CPPUNIT_ASSERT_EQUAL( OUString( "vnd.sun.star.Package:Models/Fallbacks/jeep.png" ), pGrafic->GetGrafStreamURL()); // Second object is a sound SdrMediaObj *pMediaObj = dynamic_cast<SdrMediaObj*>( pPage->GetObj( 3 )); |