summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-12-08 00:53:27 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-01-31 01:30:11 +0000
commitd48568d37c54669f1a90eef1fdb11a1b779e3345 (patch)
treecffcc15628bac1adfbb5b5da8e935b3249e80666
parent1c3ce40d97bffca5ea3df3e0f5bbac74a01846fb (diff)
don't generate invalid xml files
VmlCommentExporter::StartShape already adds a XML_type to the attribute list, so we would be exporting the same attribute twice which makes the xml file invalid. This file could therefore not be imported again. Change-Id: I2aed2805ea59c15b1f7e60ab9cab10f7a8e81412 Reviewed-on: https://gerrit.libreoffice.org/6980 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r--oox/source/export/vmlexport.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 09600294042b..c0acded3c843 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -1022,7 +1022,7 @@ sal_Int32 VMLExport::StartShape()
// add style
m_pShapeAttrList->add( XML_style, m_pShapeStyle->makeStringAndClear() );
- if ( nShapeElement >= 0 )
+ if ( nShapeElement >= 0 && !m_pShapeAttrList->hasAttribute( XML_type ) )
{
if ( bReferToShapeType )
{