diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-10 21:30:22 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-12 21:43:36 +0200 |
| commit | 653bac184f579524bc25a9f40281763a736ae6fd (patch) | |
| tree | 4b18867451c01bdd158ba36e9a9f9d2aaf7890de /xmloff | |
| parent | fe70101856332663f600df144b39d2638b3d0570 (diff) | |
Make glTF support an experimental feature
Change-Id: I75e69ba1acafbab8362536f02f4d39a8fc2deed1
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/CppunitTest_xmloff_uxmloff.mk | 1 | ||||
| -rw-r--r-- | xmloff/Library_xo.mk | 1 | ||||
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/xmloff/CppunitTest_xmloff_uxmloff.mk b/xmloff/CppunitTest_xmloff_uxmloff.mk index 1fa4ca473b72..9228357f18a1 100644 --- a/xmloff/CppunitTest_xmloff_uxmloff.mk +++ b/xmloff/CppunitTest_xmloff_uxmloff.mk @@ -45,6 +45,7 @@ $(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 553fcc148d36..1bf512c2da3a 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -50,6 +50,7 @@ $(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 a62eefb167a1..3973c0f014a4 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -81,6 +81,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/vector/b2dvector.hxx> +#include <svtools/miscopt.hxx> #include <config_features.h> @@ -3081,7 +3082,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( "application/vnd.gltf+json" ) ) + if( xAttrList->getValueByIndex( n ).equalsAscii( "application/vnd.gltf+json" ) && SvtMiscOptions().IsExperimentalMode() ) mbMedia = true; #endif // leave this loop @@ -3603,7 +3604,7 @@ SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPref // For glTF models the fallback image is placed before the real shape. // So we need to remove the fallback image after real shape is detected. else if ( mxImplContext.Is() && IsXMLToken(mxImplContext->GetLocalName(), XML_IMAGE) && - IsXMLToken( rLocalName, XML_PLUGIN ) ) + IsXMLToken( rLocalName, XML_PLUGIN ) && SvtMiscOptions().IsExperimentalMode() ) { SvXMLShapeContext* pShapeContext= GetImport().GetShapeImport()->CreateFrameChildContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShapes, mxAttrList ); |