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

[Michael Stahl (via logerrit)]

 sw/source/filter/xml/xmlfmte.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit de0120d9f75159f85d723439a89a6449082de669
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Aug 3 11:10:34 2022 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Aug 3 17:28:46 2022 +0200

    tdf#145226 sw: ODF export: fix table-row/table-cell style display-name
    
    Missed this attribute in commit 5a9fe1d80ea977c439dd10ee2056abe6b0cb4d07
    
    Change-Id: Icc3c0ad32905b04bbf73cae976a58b9b505d245c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137740
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index f0a6aab224d3..f98e4ae3fb28 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -60,10 +60,12 @@ void SwXMLExport::ExportFormat(const SwFormat& rFormat, 
enum XMLTokenEnum eFamil
     // style:name="..."
     assert(oStyleName || (eFamily != XML_TABLE_ROW && eFamily != 
XML_TABLE_CELL));
     bool bEncoded = false;
-    AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, EncodeStyleName(
-                oStyleName ? *oStyleName : rFormat.GetName(), &bEncoded) );
+    OUString const name(oStyleName ? *oStyleName : rFormat.GetName());
+    AddAttribute(XML_NAMESPACE_STYLE, XML_NAME, EncodeStyleName(name, 
&bEncoded));
     if( bEncoded )
-        AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY_NAME, rFormat.GetName() 
);
+    {
+        AddAttribute(XML_NAMESPACE_STYLE, XML_DISPLAY_NAME, name);
+    }
 
     if( eFamily != XML_TOKEN_INVALID )
         AddAttribute( XML_NAMESPACE_STYLE, XML_FAMILY, eFamily );