From e8fcf1153fd93b4f8155da0d571935125367a59b Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Wed, 11 Jun 2014 12:37:15 +0200 Subject: Change glTF mime type: {application -> model}/vnd.gltf+json There is no an accepted mime type for glTF models yet, so follow collada's mime type: model/vnd.collada+xml. Change-Id: I1e23a95dbb0caea781dade819f8e08235cb5c1dc --- xmloff/source/draw/shapeexport.cxx | 2 +- xmloff/source/draw/ximpshap.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xmloff/source') diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 0597ada5694c..acccb67a0e93 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -3275,7 +3275,7 @@ void XMLShapeExport::ImpExportMediaShape( OUString const persistentURL = lcl_StoreMediaAndGetURL(GetExport(), xPropSet, aMediaURL, sMimeType); #if HAVE_FEATURE_GLTF - if( sMimeType == "application/vnd.gltf+json" ) + if( sMimeType == "model/vnd.gltf+json" ) lcl_StoreJsonExternalsAndFallback(GetExport(), xPropSet, aMediaURL); #endif diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 3973c0f014a4..d1caa4e08496 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -3082,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" ) && SvtMiscOptions().IsExperimentalMode() ) + if( xAttrList->getValueByIndex( n ).equalsAscii( "model/vnd.gltf+json" ) && SvtMiscOptions().IsExperimentalMode() ) mbMedia = true; #endif // leave this loop -- cgit