Revert "Make glTF support an experimental feature"

Actually make it experimental mode was unecessary on master.

This reverts commit 653bac184f579524bc25a9f40281763a736ae6fd.

Conflicts:
sd/qa/unit/import-tests.cxx
xmloff/source/draw/ximpshap.cxx

Change-Id: Ie8747745a9a89ce4d6500a35d15a98e28bda840a

6 files changed, 8 insertions, 38 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 ));
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 1e6cf272aba9..2d503cd3fc87 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -79,8 +79,6 @@
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnwtit.hxx>
 
-#include <svtools/miscopt.hxx>
-
 #include <tools/diagnose_ex.h>
 
 #include <unotools/useroptions.hxx>
@@ -1171,9 +1169,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 #if HAVE_FEATURE_GLTF
         case SID_INSERT_3DMODEL:
         {
-            if( !SvtMiscOptions().IsExperimentalMode() )
-                break;
-
             SetCurrentFunction( FuInsert3DModel::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
 
             Cancel();
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 2bd235ec3bc6..d57b4a6ad2ba 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -43,8 +43,6 @@
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
 
-#include <svtools/miscopt.hxx>
-
 // #UndoRedo#
 #include <svl/slstitm.hxx>
 #include <sfx2/app.hxx>
@@ -1662,18 +1660,13 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         }
     }
 
-    bool bDisableInsert3DModel = false;
 #if !HAVE_FEATURE_GLTF
-    bDisableInsert3DModel = true;
-#else
-    bDisableInsert3DModel = !SvtMiscOptions().IsExperimentalMode();
-#endif
-
-    if (bDisableInsert3DModel && SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_INSERT_3DMODEL))
+    if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_INSERT_3DMODEL))
     {
         rSet.DisableItem(SID_INSERT_3DMODEL);
         rSet.Put(SfxVisibilityItem(SID_INSERT_3DMODEL, false));
     }
+#endif
 
     GetModeSwitchingMenuState (rSet);
 }
diff --git a/xmloff/CppunitTest_xmloff_uxmloff.mk b/xmloff/CppunitTest_xmloff_uxmloff.mk
index 9228357f18a1..1fa4ca473b72 100644
--- a/xmloff/CppunitTest_xmloff_uxmloff.mk
+++ b/xmloff/CppunitTest_xmloff_uxmloff.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_CppunitTest_use_libraries,xmloff_uxmloff, \
     salhelper \
 	sax \
     svl \
-    svt \
 	test \
     tl \
     utl \
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 1bf512c2da3a..553fcc148d36 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_Library_use_libraries,xo,\
     salhelper \
 	sax \
     svl \
-    svt \
     tl \
     utl \
     vcl \
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 4bc580dc2603..dee14cef6625 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -81,7 +81,6 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/vector/b2dvector.hxx>
-#include <svtools/miscopt.hxx>
 
 #include <config_features.h>
 
@@ -3082,7 +3081,7 @@ void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Referen
             if( xAttrList->getValueByIndex( n ).equalsAscii( "application/vnd.sun.star.media" ) )
                 mbMedia = true;
 #if HAVE_FEATURE_GLTF
-            if( xAttrList->getValueByIndex( n ).equalsAscii( "model/vnd.gltf+json" ) && SvtMiscOptions().IsExperimentalMode() )
+            if( xAttrList->getValueByIndex( n ).equalsAscii( "model/vnd.gltf+json" ) )
                 mbMedia = true;
 #endif
             // leave this loop
@@ -3535,14 +3534,9 @@ SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPref
         if ( !msHyperlink.isEmpty() )
             pShapeContext->setHyperlink( msHyperlink );
 
-        // Ignore gltf model if necessary and so the fallback image will be imported
-        bool bIngoreGltf;
 #if !HAVE_FEATURE_GLTF
-        bIngoreGltf = true;
-#else
-        bIngoreGltf = !SvtMiscOptions().IsExperimentalMode();
-#endif
-        if( bIngoreGltf && IsXMLToken(rLocalName, XML_PLUGIN ) )
+        // Ignore gltf model if necessary and so the fallback image will be imported
+        if( IsXMLToken(rLocalName, XML_PLUGIN ) )
         {
             SdXMLPluginShapeContext* pPluginContext = dynamic_cast<SdXMLPluginShapeContext*>(pShapeContext);
             if( pPluginContext && pPluginContext->getMimeType() == "model/vnd.gltf+json" )
@@ -3551,6 +3545,7 @@ SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPref
                  return this;
             }
         }
+#endif
 
         mxImplContext = pContext;
         mbSupportsReplacement = IsXMLToken(rLocalName, XML_OBJECT ) || IsXMLToken(rLocalName, XML_OBJECT_OLE);