diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-11 12:37:15 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-13 00:33:10 +0200 |
| commit | c02888383e9666ac29e3c9c4b4549030d16a6d57 (patch) | |
| tree | be5cf5c6d08a697d90921e2d42b613423ac3c2d1 /xmloff | |
| parent | fcee15fdac221139103a46b13ef01367f633c7bc (diff) | |
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
(cherry picked from commit e8fcf1153fd93b4f8155da0d571935125367a59b)
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
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 bc7f292b1b64..cdcb170fc226 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -3071,7 +3071,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 |