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

Michael Stahl mstahl at redhat.com
Mon Jan 29 09:44:40 UTC 2018


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

New commits:
commit 88fe1bb839ab0de362295ba88c9ec6947655654a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jan 29 10:18:37 2018 +0100

    xmloff: add a comment too
    
    Change-Id: Ic23c36250938009b17f4b916f0d13a097d018a0c

diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index f7529a77ea94..30944401316c 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -609,18 +609,15 @@ void XMLTableExport::exportTableTemplates()
             }
             else
             {
-                // Below condition checks if any of the extended version of
-                // XML are set
+                // checks if any of the extended version of ODF are set
                 if ((eVersion & SvtSaveOptions::ODFSVER_EXTENDED) != 0)
                 {
+                    // tdf#106780 historically this wrong attribute was used
+                    // for the name; write it if extended because LO < 5.3 can
+                    // read only text:style-name, not the correct table:name
                     mrExport.AddAttribute(XML_NAMESPACE_TEXT, XML_STYLE_NAME, GetExport().EncodeStyleName( xTableStyle->getName() ) );
-                    mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, GetExport().EncodeStyleName( xTableStyle->getName() ) );
                 }
-                else
-                {
-                    mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, GetExport().EncodeStyleName( xTableStyle->getName() ) );
-                }
-
+                mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, GetExport().EncodeStyleName(xTableStyle->getName()));
             }
 
              SvXMLElementExport tableTemplate( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_TEMPLATE, true, true );


More information about the Libreoffice-commits mailing list