Resolves: tdf#129250 move redline type into RedlinData so we can sort on it

Change-Id: Ia8e6744c1679655240a9a9cee9425030e994e16b
Reviewed-on: https://gerrit.libreoffice.org/84805
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

2 files changed, 3 insertions, 15 deletions

diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 7f9eeee6a11e..395fae8d47e2 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -28,6 +28,7 @@
 
 #include <com/sun/star/uno/Sequence.h>
 #include <o3tl/typed_flags_set.hxx>
+#include <svx/ctredlin.hxx>
 
 #include "docary.hxx"
 
@@ -60,21 +61,6 @@ namespace o3tl
     template<> struct typed_flags<RedlineFlags> : is_typed_flags<RedlineFlags, 0x533> {};
 }
 
-enum class RedlineType : sal_uInt16
-{
-    // Range of RedlineTypes is 0 to 127.
-    Insert = 0x0,// Content has been inserted.
-    Delete = 0x1,// Content has been deleted.
-    Format = 0x2,// Attributes have been applied.
-    Table = 0x3,// Table structure has been altered.
-    FmtColl = 0x4,// Style has been altered (Autoformat!).
-    ParagraphFormat = 0x5,// Paragraph attributes have been changed.
-    TableRowInsert = 0x6,// Table row has been inserted.
-    TableRowDelete = 0x7,// Table row has been deleted.
-    TableCellInsert = 0x8,// Table cell has been inserted.
-    TableCellDelete = 0x9,// Table cell has been deleted.
-    Any = USHRT_MAX // special value to indicate any redline type in some method calls
-};
 inline OUString SwRedlineTypeToOUString(RedlineType eType)
 {
     OUString sRet;
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 431441c9f15c..1fc7a359bbf6 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -573,6 +573,7 @@ void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRa
             OUString sImage(GetActionImage(rRedln, nStack));
             OUString sAuthor = rRedln.GetAuthorString(nStack);
             pData->aDateTime = rRedln.GetTimeStamp(nStack);
+            pData->eType = rRedln.GetType(nStack);
             OUString sDateEntry = GetAppLangDateTimeString(pData->aDateTime);
             OUString sComment = rRedln.GetComment(nStack);
 
@@ -735,6 +736,7 @@ void SwRedlineAcceptDlg::InsertParents(SwRedlineTable::size_type nStart, SwRedli
         OUString sImage = GetActionImage(rRedln);
         OUString sAuthor = rRedln.GetAuthorString(0);
         pData->aDateTime = rRedln.GetTimeStamp(0);
+        pData->eType = rRedln.GetType(0);
         OUString sDateEntry = GetAppLangDateTimeString(pData->aDateTime);
 
         OUString sId = OUString::number(reinterpret_cast<sal_Int64>(pData.release()));