diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-16 18:47:03 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-16 18:47:03 +0200 |
| commit | 8f990753138ef4d25a54652cf7cf0f257b35dc0b (patch) | |
| tree | ae591d2bd6bfad6ba4d90fe8d4d755e5fa00718c /sd/qa | |
| parent | e1af737ef9c1ae599cf9758d199edfd7e16da62a (diff) | |
Revert "Make glTF support an experimental feature"
There are others who think this will work better before the
release.
This reverts commit 653bac184f579524bc25a9f40281763a736ae6fd.
Conflicts:
sd/qa/unit/import-tests.cxx
xmloff/source/draw/ximpshap.cxx
Change-Id: Ie8747745a9a89ce4d6500a35d15a98e28bda840a
Diffstat (limited to 'sd/qa')
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index d5917327188e..8d43ea0245a8 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -30,7 +30,6 @@ #include <svx/svdomedia.hxx> #include <svx/svdoole2.hxx> #include <svx/xflclit.hxx> -#include <svtools/miscopt.hxx> #include <animations/animationnodehelper.hxx> #include <com/sun/star/drawing/XDrawPage.hpp> @@ -711,7 +710,6 @@ void SdFiltersTest::testFdo71961() void SdFiltersTest::testMediaEmbedding() { - SvtMiscOptions().SetExperimentalMode(true); ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/media_embedding.odp")); #if HAVE_FEATURE_GLTF @@ -729,21 +727,12 @@ void SdFiltersTest::testMediaEmbedding() CPPUNIT_ASSERT_MESSAGE( "missing model", pModelObj != NULL); CPPUNIT_ASSERT_EQUAL( OUString( "vnd.sun.star.Package:Models/duck/duck.json" ), pModelObj->getMediaProperties().getURL()); CPPUNIT_ASSERT_EQUAL( OUString( "model/vnd.gltf+json" ), pModelObj->getMediaProperties().getMimeType()); - - // Check the case when experimental mode is disabled - xDocShRef->DoClose(); - SvtMiscOptions().SetExperimentalMode(false); - xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/media_embedding.odp")); - pDoc = xDocShRef->GetDoc(); - CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL ); - pPage = pDoc->GetPage (1); - CPPUNIT_ASSERT_MESSAGE( "no page", pPage != NULL ); -#endif - +#else // 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:Models/Fallbacks/duck.png" ), pGrafic->GetGrafStreamURL()); +#endif // Second object is a sound SdrMediaObj *pMediaObj = dynamic_cast<SdrMediaObj*>( pPage->GetObj( 3 )); |