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

[Caolán McNamara]

 xmloff/source/text/txtparae.cxx |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit bd75327c8bc1157036ca11db8c808dc7ceb2109e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 22 14:10:38 2015 +0100

    fix assert on export of ooo63141-1.doc to odt
    
    if bAutoStyles is true then the mbDoSomething of the SvXMLElementExport is
    false, and the ctor/dtor doesn't do anything so any attributes added to the
    exporter are not cleared by the SvXMLElementExport dtor
    
    so only add the attribute if bAutoStyles if false and might as well extend the
    block to cover the use of SvXMLElementExport and use the other ctor which
    defaults mbDoSomething on
    
    Change-Id: If35cd35e902372562fd7e78b3f970d91fcec3c16

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 3b1ab76..636323a 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2210,13 +2210,16 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
             }
             else if ( sType == sAnnotationEnd )
             {
-                Reference<XNamed> xBookmark(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
-                const OUString& rName = xBookmark->getName();
-                if ( rName.getLength() > 0 )
+                if (!bAutoStyles)
                 {
-                    GetExport().AddAttribute(XML_NAMESPACE_OFFICE, XML_NAME, rName);
+                    Reference<XNamed> xBookmark(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
+                    const OUString& rName = xBookmark->getName();
+                    if (!rName.isEmpty())
+                    {
+                        GetExport().AddAttribute(XML_NAMESPACE_OFFICE, XML_NAME, rName);
+                    }
+                    SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_OFFICE, XML_ANNOTATION_END, false, false );
                 }
-                SvXMLElementExport aElem( GetExport(), !bAutoStyles, XML_NAMESPACE_OFFICE, XML_ANNOTATION_END, false, false );
             }
             else if( sType.equals( sFrame ) )
             {