1 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index 0d0e013ff6d5..5c301312640e 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -39,18 +39,18 @@ class SwExtend
     std::unique_ptr<SwFont> m_pFont;
     const std::vector<ExtTextInputAttr> &m_rArr;
     /// position of start of SwExtTextInput
-    sal_uLong const m_nNode;
+    SwNodeOffset const m_nNode;
     sal_Int32 const m_nStart;
     /// current position (inside)
     sal_Int32 m_nPos;
     /// position of end of SwExtTextInput (in same node as start)
     sal_Int32 const m_nEnd;
-    bool Leave_(SwFont& rFnt, sal_uLong nNode, sal_Int32 nNew);
+    bool Leave_(SwFont& rFnt, SwNodeOffset nNode, sal_Int32 nNew);
     bool Inside() const { return (m_nPos >= m_nStart && m_nPos < m_nEnd); }
     static void ActualizeFont( SwFont &rFnt, ExtTextInputAttr nAttr );
 public:
     SwExtend(const std::vector<ExtTextInputAttr> &rArr,
-             sal_uLong const nNode, sal_Int32 const nStart)
+             SwNodeOffset const nNode, sal_Int32 const nStart)
         : m_rArr(rArr)
         , m_nNode(nNode)
         , m_nStart(nStart)
@@ -59,10 +59,10 @@ public:
     {}
     bool IsOn() const { return m_pFont != nullptr; }
     void Reset() { m_pFont.reset(); m_nPos = COMPLETE_STRING; }
-    bool Leave(SwFont& rFnt, sal_uLong const nNode, sal_Int32 const nNew)
+    bool Leave(SwFont& rFnt, SwNodeOffset const nNode, sal_Int32 const nNew)
         { return m_pFont && Leave_(rFnt, nNode, nNew); }
-    short Enter(SwFont& rFnt, sal_uLong nNode, sal_Int32 nNew);
-    sal_Int32 Next(sal_uLong nNode, sal_Int32 nNext);
+    short Enter(SwFont& rFnt, SwNodeOffset nNode, sal_Int32 nNew);
+    sal_Int32 Next(SwNodeOffset nNode, sal_Int32 nNext);
     SwFont* GetFont() { return m_pFont.get(); }
     void UpdateFont(SwFont &rFont) { ActualizeFont(rFont, m_rArr[m_nPos - m_nStart]); }
 };
@@ -75,7 +75,7 @@ class SwRedlineItr
     std::unique_ptr<SfxItemSet> m_pSet;
     std::unique_ptr<SwExtend> m_pExt;
     // note: this isn't actually used in the merged-para (Hide) case
-    sal_uLong const m_nNdIdx;
+    SwNodeOffset const m_nNdIdx;
     SwRedlineTable::size_type const m_nFirst;
     SwRedlineTable::size_type m_nAct;
     sal_Int32 m_nStart;
@@ -89,12 +89,12 @@ private:
     void Clear_( SwFont* pFnt );
     bool ChkSpecialUnderline_() const;
     void FillHints( std::size_t nAuthor, RedlineType eType );
-    short EnterExtend(SwFont& rFnt, sal_uLong const nNode, sal_Int32 const nNew)
+    short EnterExtend(SwFont& rFnt, SwNodeOffset const nNode, sal_Int32 const nNew)
     {
         if (m_pExt) return m_pExt->Enter(rFnt, nNode, nNew);
         return 0;
     }
-    sal_Int32 NextExtend(sal_uLong const nNode, sal_Int32 const nNext) {
+    sal_Int32 NextExtend(SwNodeOffset const nNode, sal_Int32 const nNext) {
         if (m_pExt) return m_pExt->Next(nNode, nNext);
         return nNext;
     }
@@ -108,7 +108,7 @@ public:
     bool IsOn() const { return m_bOn || (m_pExt && m_pExt->IsOn()); }
     void Clear( SwFont* pFnt ) { if (m_bOn) Clear_( pFnt ); }
     void ChangeTextAttr( SwFont* pFnt, SwTextAttr const &rHt, bool bChg );
-    short Seek(SwFont& rFnt, sal_uLong nNode, sal_Int32 nNew, sal_Int32 nOld);
+    short Seek(SwFont& rFnt, SwNodeOffset nNode, sal_Int32 nNew, sal_Int32 nOld);
     void Reset() {
         if (m_nAct != m_nFirst) m_nAct = SwRedlineTable::npos;
         if (m_pExt) m_pExt->Reset();
@@ -117,10 +117,10 @@ public:
         sal_Int32 nNext, SwTextNode const* pNode, SwRedlineTable::size_type & rAct);
     bool ChkSpecialUnderline() const
         { return IsOn() && ChkSpecialUnderline_(); }
-    bool CheckLine(sal_uLong nStartNode, sal_Int32 nChkStart, sal_uLong nEndNode,
+    bool CheckLine(SwNodeOffset nStartNode, sal_Int32 nChkStart, SwNodeOffset nEndNode,
         sal_Int32 nChkEnd, OUString& rRedlineText, bool& bRedlineEnd,
-        RedlineType& eRedlineEnd, bool bFullLine = true);
-    bool LeaveExtend(SwFont& rFnt, sal_uLong const nNode, sal_Int32 const nNew)
+        RedlineType& eRedlineEnd, size_t* pAuthorAtPos = nullptr);
+    bool LeaveExtend(SwFont& rFnt, SwNodeOffset const nNode, sal_Int32 const nNew)
         { return m_pExt->Leave(rFnt, nNode, nNew); }
     bool ExtOn() {
         if (m_pExt) return m_pExt->IsOn();