convert nsRedlineType_t to scoped enum

and move the auto-format embedded flag to a separate field

Change-Id: I02155702389178fbfdf874f592d47a29f8759974
Reviewed-on: https://gerrit.libreoffice.org/72771
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 6 insertions, 6 deletions

diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index ae7fbe949ba0..47c1aedab650 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -217,18 +217,18 @@ class SW_DLLPUBLIC SwFltRedline : public SfxPoolItem
 public:
     DateTime const        aStamp;
     DateTime const        aStampPrev;
-    RedlineType_t const   eType;
-    RedlineType_t const   eTypePrev;
+    RedlineType const   eType;
+    RedlineType const   eTypePrev;
     std::size_t const     nAutorNo;
     std::size_t const     nAutorNoPrev;
 
     static constexpr auto NoPrevAuthor
         = std::numeric_limits<std::size_t>::max();
 
-    SwFltRedline(RedlineType_t   eType_,
+    SwFltRedline(RedlineType   eType_,
                  std::size_t     nAutorNo_,
                  const DateTime& rStamp_,
-                 RedlineType_t   eTypePrev_    = nsRedlineType_t::REDLINE_INSERT,
+                 RedlineType   eTypePrev_    = RedlineType::Insert,
                  std::size_t     nAutorNoPrev_ = NoPrevAuthor)
         : SfxPoolItem(RES_FLTR_REDLINE), aStamp(rStamp_),
         aStampPrev( DateTime::EMPTY ),
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 82cae2073536..f36c78fb3d58 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -302,8 +302,8 @@ namespace sw
             explicit RedlineStack(SwDoc &rDoc) : mrDoc(rDoc) {}
             void MoveAttrs(const SwPosition& rPos);
             void open(const SwPosition& rPos, const SfxPoolItem& rAttr);
-            bool close(const SwPosition& rPos, RedlineType_t eType);
-            void close(const SwPosition& rPos, RedlineType_t eType,
+            bool close(const SwPosition& rPos, RedlineType eType);
+            void close(const SwPosition& rPos, RedlineType eType,
                 WW8TabDesc* pTabDesc );
             void closeall(const SwPosition& rPos);
             ~RedlineStack();