summaryrefslogtreecommitdiff
path: root/xmloff/source/draw/ximpshap.cxx
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-06-16 18:59:25 +0200
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-06-16 18:59:25 +0200
commitb7f2cad98730ee97805fa1f831613cbfd76a9870 (patch)
treed22563af3150ba499f1b6455a22ce9810a63f4d6 /xmloff/source/draw/ximpshap.cxx
parentb7e2a62dec5e9a01b1c83255aedf902f180e4ca0 (diff)
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
Diffstat (limited to 'xmloff/source/draw/ximpshap.cxx')
-rw-r--r--xmloff/source/draw/ximpshap.cxx13
1 files changed, 4 insertions, 9 deletions
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);