mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix gltf export: close plugin element before export fallback

Browse Source 
Change-Id: I2e1f27e535ee45259f7bdf783ea5224b2ad559ef
This commit is contained in:
Zolnai Tamás
2014-06-16 13:55:40 +02:00
parent 4d8c4e7fe3
commit 04b7b2c72f
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sd/qa/unit/data/media_embedding.odp
View File

Binary file not shown.

3
xmloff/source/draw/shapeexport.cxx
View File

@@ -3332,7 +3332,7 @@ void XMLShapeExport::ImpExportMediaShape(
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, sMimeType );
// write plugin
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PLUGIN, !( nFeatures & SEF_EXPORT_NO_WS ), true);
SvXMLElementExport* pPluginOBJ = new SvXMLElementExport(mrExport, XML_NAMESPACE_DRAW, XML_PLUGIN, !( nFeatures & SEF_EXPORT_NO_WS ), true);
// export parameters
const OUString aFalseStr( "false" ), aTrueStr( "true" );
@@ -3384,6 +3384,7 @@ void XMLShapeExport::ImpExportMediaShape(
delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ) );
}
delete pPluginOBJ;
#if HAVE_FEATURE_GLTF
if( sMimeType == "model/vnd.gltf+json" )
lcl_StoreGltfFallback(GetExport(), xPropSet, aMediaURL);