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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/docxattributeoutput.cxx |   29 ++++++++++-----------------
 1 file changed, 11 insertions(+), 18 deletions(-)

New commits:
commit d0a5d8429c9338056ae0b0c22128db9f6a07e159
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Mar 13 11:46:34 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Mar 13 21:51:55 2022 +0100

    cid#1502949 Logically dead code
    
    Change-Id: I259e105c73141744b667f8ab61fd61dac8e4ef9a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131500
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 2915d96c5722..45d8d809084f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1921,25 +1921,18 @@ void 
DocxAttributeOutput::DoWriteMoveRangeTagStart(const OString & bookmarkName,
     const DateTime aDateTime = pRedlineData->GetTimeStamp();
     bool bNoDate = bRemovePersonalInfo ||
         ( aDateTime.GetYear() == 1970 && aDateTime.GetMonth() == 1 && 
aDateTime.GetDay() == 1 );
-    if ( bNoDate )
-        m_pSerializer->singleElementNS(XML_w, bFrom
-                ? XML_moveFromRangeStart
-                : XML_moveToRangeStart,
-            FSNS(XML_w, XML_id), OString::number(m_nNextBookmarkId),
-            FSNS(XML_w, XML_author ), bRemovePersonalInfo
-                    ? "Author" + OString::number( 
GetExport().GetInfoID(rAuthor) )
-                    : OUStringToOString(rAuthor, RTL_TEXTENCODING_UTF8),
-            FSNS(XML_w, XML_name), bookmarkName);
-    else
-        m_pSerializer->singleElementNS(XML_w, bFrom
-                ? XML_moveFromRangeStart
-                : XML_moveToRangeStart,
-            FSNS(XML_w, XML_id), OString::number(m_nNextBookmarkId),
-            FSNS(XML_w, XML_author ), bRemovePersonalInfo
+
+    rtl::Reference<sax_fastparser::FastAttributeList> pAttributeList
+        = sax_fastparser::FastSerializerHelper::createAttrList();
+
+    pAttributeList->add(FSNS(XML_w, XML_id), 
OString::number(m_nNextBookmarkId));
+    pAttributeList->add(FSNS(XML_w, XML_author ), bRemovePersonalInfo
                     ? "Author" + OString::number( 
GetExport().GetInfoID(rAuthor) )
-                    : OUStringToOString(rAuthor, RTL_TEXTENCODING_UTF8),
-            FSNS(XML_w, XML_date ), DateTimeToOString( aDateTime ),
-            FSNS(XML_w, XML_name), bookmarkName);
+                    : OUStringToOString(rAuthor, RTL_TEXTENCODING_UTF8));
+    if (!bNoDate)
+        pAttributeList->add(FSNS(XML_w, XML_date ), DateTimeToOString( 
aDateTime ));
+    pAttributeList->add(FSNS(XML_w, XML_name), bookmarkName);
+    m_pSerializer->singleElementNS( XML_w, bFrom ? XML_moveFromRangeStart : 
XML_moveToRangeStart, pAttributeList );
 }
 
 void DocxAttributeOutput::DoWriteMoveRangeTagEnd(sal_Int32 const nId, bool 
bFrom)