[Libreoffice-commits] core.git: oox/source

[Markus Mohrhard]

 oox/source/export/vmlexport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d48568d37c54669f1a90eef1fdb11a1b779e3345
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Dec 8 00:53:27 2013 +0100

    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 at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 0960029..c0acded 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 )
         {