core.git: Branch 'distro/collabora/co-24.04' - sw/source

[Pranam Lashkari (via logerrit)]

 sw/source/uibase/docvw/PostItMgr.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 0b3e73526496875735eeb657929d94897a840b02
Author:     Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Tue Dec 24 11:59:39 2024 +0530
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Jan 7 15:08:15 2025 +0100

    lok: send username of the person who removed comments
    
    This can be userful to know when a user is editing comment
    and another user deletes it.
    It will help to identify and inform about
    the conflict to relevent users only
    
    Change-Id: I81f5edc8f6cbb85ad00e03b5bf668b68eeae1ad8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179298
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sw/source/uibase/docvw/PostItMgr.cxx 
b/sw/source/uibase/docvw/PostItMgr.cxx
index 21a498e8dd56..b46015e077d0 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -181,6 +181,12 @@ namespace {
             aAnnotation.put("textRange", sRects.getStr());
             aAnnotation.put("layoutStatus", pItem->mLayoutStatus);
         }
+        if (nType == CommentNotificationType::Remove && 
comphelper::LibreOfficeKit::isActive())
+        {
+            // Redline author is basically the author which has made the 
modification rather than author of the comments
+            // This is important to know who removed the comment
+            aAnnotation.put("author", 
SW_MOD()->GetRedlineAuthor(SW_MOD()->GetRedlineAuthor()));
+        }
 
         boost::property_tree::ptree aTree;
         aTree.add_child("comment", aAnnotation);