[Libreoffice-commits] core.git: sd/qa xmloff/source
Zolnai Tamás
tamas.zolnai at collabora.com
Mon Jun 16 05:00:01 PDT 2014
sd/qa/unit/data/media_embedding.odp |binary
xmloff/source/draw/shapeexport.cxx | 3 ++-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 04b7b2c72fbfa57180cac680b07618fc40fe0da6
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date: Mon Jun 16 13:55:40 2014 +0200
Fix gltf export: close plugin element before export fallback
Change-Id: I2e1f27e535ee45259f7bdf783ea5224b2ad559ef
diff --git a/sd/qa/unit/data/media_embedding.odp b/sd/qa/unit/data/media_embedding.odp
index 368b1fa..4174e84 100644
Binary files a/sd/qa/unit/data/media_embedding.odp and b/sd/qa/unit/data/media_embedding.odp differ
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 68965ed..fff8f4a 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -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);
More information about the Libreoffice-commits
mailing list