core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/docxattributeoutput.cxx |   30 +++++++++++----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

New commits:
commit ca7ee477978c6b818a28fcd601a7033066e23a9f
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Jan 6 11:53:11 2025 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Jan 6 14:26:02 2025 +0100

    merge duplicate part of branches
    
    Change-Id: I58d4748819c5eb950f26f09684eb93d55bf025ba
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179827
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 69408eddad61..0cd8b728bbb3 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2340,33 +2340,29 @@ void 
DocxAttributeOutput::DoWritePermissionTagStart(std::u16string_view permissi
 {
     std::u16string_view permissionIdAndName;
 
+    sal_Int32 nFSNS;
+
     if (o3tl::starts_with(permission, u"permission-for-group:", 
&permissionIdAndName))
     {
-        const std::size_t separatorIndex = permissionIdAndName.find(u':');
-        assert(separatorIndex != std::u16string_view::npos);
-        const OUString permissionId(permissionIdAndName.substr(0, 
separatorIndex));
-        const OUString 
permissionName(permissionIdAndName.substr(separatorIndex + 1));
-
-        m_pSerializer->singleElementNS(XML_w, XML_permStart,
-            FSNS(XML_w, XML_id), GetExport().BookmarkToWord(permissionId),
-            FSNS(XML_w, XML_edGrp), 
GetExport().BookmarkToWord(permissionName));
+        nFSNS = FSNS(XML_w, XML_edGrp);
     }
     else
     {
         auto const ok = o3tl::starts_with(
             permission, u"permission-for-user:", &permissionIdAndName);
         assert(ok); (void)ok;
-        const std::size_t separatorIndex = permissionIdAndName.find(u':');
-        assert(separatorIndex != std::u16string_view::npos);
-        const OUString permissionId(permissionIdAndName.substr(0, 
separatorIndex));
-        const OUString 
permissionName(permissionIdAndName.substr(separatorIndex + 1));
-
-        m_pSerializer->singleElementNS(XML_w, XML_permStart,
-            FSNS(XML_w, XML_id), GetExport().BookmarkToWord(permissionId),
-            FSNS(XML_w, XML_ed), GetExport().BookmarkToWord(permissionName));
+        nFSNS = FSNS(XML_w, XML_ed);
     }
-}
 
+    const std::size_t separatorIndex = permissionIdAndName.find(u':');
+    assert(separatorIndex != std::u16string_view::npos);
+    const OUString permissionId(permissionIdAndName.substr(0, separatorIndex));
+    const OUString permissionName(permissionIdAndName.substr(separatorIndex + 
1));
+
+    m_pSerializer->singleElementNS(XML_w, XML_permStart,
+        FSNS(XML_w, XML_id), GetExport().BookmarkToWord(permissionId),
+        nFSNS, GetExport().BookmarkToWord(permissionName));
+}
 
 // For construction of the special bookmark name template for permissions:
 // see, PermInsertPosition::createBookmarkName()