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

[László Németh (via logerrit)]

 sw/inc/bitmaps.hlst                |    2 ++
 sw/source/uibase/misc/redlndlg.cxx |    8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit a478ac0f0a1eda92d35477462f70412bc65f9d36
Author:     László Németh <nem...@numbertext.org>
AuthorDate: Thu Nov 18 11:39:42 2021 +0100
Commit:     László Németh <nem...@numbertext.org>
CommitDate: Thu Nov 18 13:46:06 2021 +0100

    tdf#145721 sw: add 'moved text' icons to Manage Changes
    
    For Moved (deletion) and Moved (insertion) text changes,
    add new Action icons to Manage Changes dialog window
    (Edit->Track Changes->Manage...), re-using existing
    Cut and Paste icons.
    
    Follow-up to commit 970f8ec7c8eb6007181ce55d885eef771dd49cc6
    "tdf#145721 sw track changes: sign text moving in redline tooltips".
    
    Change-Id: Ic202538ec31963e5e27170c7e5ea819a7f2bde9b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125445
    Tested-by: Jenkins
    Reviewed-by: László Németh <nem...@numbertext.org>

diff --git a/sw/inc/bitmaps.hlst b/sw/inc/bitmaps.hlst
index b3353862bee0..2a7495d70896 100644
--- a/sw/inc/bitmaps.hlst
+++ b/sw/inc/bitmaps.hlst
@@ -26,6 +26,8 @@
 #define BMP_REDLINE_FORMATTED                   "sw/res/redline_formatted.png"
 #define BMP_REDLINE_TABLECHG                    "sw/res/redline_tablechg.png"
 #define BMP_REDLINE_FMTCOLLSET                  "sw/res/redline_fmtcollset.png"
+#define BMP_REDLINE_MOVED_INSERTION             "cmd/sc_paste.png"
+#define BMP_REDLINE_MOVED_DELETION              "cmd/sc_cut.png"
 
 #define RID_BMP_COLLAPSE                        "res/sx18002.png"
 #define RID_BMP_EXPAND                          "res/sx18003.png"
diff --git a/sw/source/uibase/misc/redlndlg.cxx 
b/sw/source/uibase/misc/redlndlg.cxx
index 5a53a7472fe0..e27a0a7d4c9b 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -305,8 +305,12 @@ OUString SwRedlineAcceptDlg::GetActionImage(const 
SwRangeRedline& rRedln, sal_uI
 {
     switch (rRedln.GetType(nStack))
     {
-        case RedlineType::Insert:  return BMP_REDLINE_INSERTED;
-        case RedlineType::Delete:  return BMP_REDLINE_DELETED;
+        case RedlineType::Insert:  return rRedln.IsMoved()
+            ? OUString(BMP_REDLINE_MOVED_INSERTION)
+            : OUString(BMP_REDLINE_INSERTED);
+        case RedlineType::Delete:  return rRedln.IsMoved()
+            ? OUString(BMP_REDLINE_MOVED_DELETION)
+            : OUString(BMP_REDLINE_DELETED);
         case RedlineType::Format:  return BMP_REDLINE_FORMATTED;
         case RedlineType::ParagraphFormat: return BMP_REDLINE_FORMATTED;
         case RedlineType::Table:   return BMP_REDLINE_TABLECHG;