diff options
| -rw-r--r-- | avmedia/source/framework/modeltools.cxx | 2 | ||||
| -rw-r--r-- | sd/qa/unit/data/media_embedding.odp | bin | 4068415 -> 4068488 bytes | |||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx index 00eab46b93b7..6119cb71acbf 100644 --- a/avmedia/source/framework/modeltools.cxx +++ b/avmedia/source/framework/modeltools.cxx @@ -260,7 +260,7 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel, xSBD->getDocumentStorage(), uno::UNO_QUERY_THROW); // Model storage - const OUString sModel("Model"); + const OUString sModel("Models"); uno::Reference<embed::XStorage> const xModelStorage( xStorage->openStorageElement(sModel, embed::ElementModes::WRITE)); 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 )); diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 16782d86278b..56c2e6426c02 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -3206,7 +3206,7 @@ static void lcl_StoreJsonExternalsAndFallback( { // Fallback storage const uno::Reference<embed::XStorage> xFallbackTarget( - xModelsTarget->openStorageElement(OUString("Fallback"), embed::ElementModes::WRITE)); + xModelsTarget->openStorageElement(OUString("Fallbacks"), embed::ElementModes::WRITE)); uno::Reference< io::XStream > xPictureStream( xFallbackTarget->openStreamElement( sModelName + ".png", embed::ElementModes::WRITE ), uno::UNO_QUERY_THROW ); @@ -3225,7 +3225,7 @@ static void lcl_StoreJsonExternalsAndFallback( xFallbackTransaction->commit(); } - const OUString sFallbackURL( sUrlPath.copy(0,sUrlPath.lastIndexOf("/")) + "/Fallback/" + sModelName + ".png"); + const OUString sFallbackURL( sUrlPath.copy(0,sUrlPath.lastIndexOf("/")) + "/Fallbacks/" + sModelName + ".png"); rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, sFallbackURL ); rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); |