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

[Miklos Vajna (via logerrit)]

 sw/source/core/doc/DocumentRedlineManager.cxx |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 1a0b516a0ce0cd6a5b8dc7b242ca6969115791aa
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue Jun 3 16:57:27 2025 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Jun 4 09:06:26 2025 +0200

    sw interdependent redlines: fix nPamEndtNI -> nPamEndNI typo
    
    That extra 't' doesn't seem to have any meaning and is inconsistent
    with the content index & start node index naming.
    
    Change-Id: Ibd938aeb91ffa281f028d5d10309a1e0fda7c541
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186152
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index ef731d5d6856..35ae1306ca74 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -3319,7 +3319,7 @@ bool 
DocumentRedlineManager::AcceptRedlineRange(SwRedlineTable::size_type nPosOr
 
     SwNodeOffset nPamStartNI = 
maRedlineTable[nPosStart]->Start()->GetNodeIndex();
     sal_Int32 nPamStartCI = 
maRedlineTable[nPosStart]->Start()->GetContentIndex();
-    SwNodeOffset nPamEndtNI = maRedlineTable[nPosEnd]->End()->GetNodeIndex();
+    SwNodeOffset nPamEndNI = maRedlineTable[nPosEnd]->End()->GetNodeIndex();
     sal_Int32 nPamEndCI = maRedlineTable[nPosEnd]->End()->GetContentIndex();
     do
     {
@@ -3330,8 +3330,8 @@ bool 
DocumentRedlineManager::AcceptRedlineRange(SwRedlineTable::size_type nPosOr
                 && pTmp->Start()->GetContentIndex() < nPamStartCI))
             break;
 
-        if (pTmp->End()->GetNodeIndex() > nPamEndtNI
-            || (pTmp->End()->GetNodeIndex() == nPamEndtNI
+        if (pTmp->End()->GetNodeIndex() > nPamEndNI
+            || (pTmp->End()->GetNodeIndex() == nPamEndNI
                 && pTmp->End()->GetContentIndex() > nPamEndCI))
         {
         }
@@ -3342,7 +3342,7 @@ bool 
DocumentRedlineManager::AcceptRedlineRange(SwRedlineTable::size_type nPosOr
                 m_rDoc.GetIDocumentUndoRedo().AppendUndo(
                     std::make_unique<SwUndoAcceptRedline>(*pTmp));
             }
-            nPamEndtNI = pTmp->Start()->GetNodeIndex();
+            nPamEndNI = pTmp->Start()->GetNodeIndex();
             nPamEndCI = pTmp->Start()->GetContentIndex();
 
             bool bHierarchicalFormat = pTmp->GetType() == RedlineType::Format 
&& pTmp->GetStackCount() > 1;
@@ -3372,7 +3372,7 @@ bool 
DocumentRedlineManager::AcceptRedlineRange(SwRedlineTable::size_type nPosOr
                 m_rDoc.GetIDocumentUndoRedo().AppendUndo(
                     std::make_unique<SwUndoAcceptRedline>(*pTmp, 1));
             }
-            nPamEndtNI = pTmp->Start()->GetNodeIndex();
+            nPamEndNI = pTmp->Start()->GetNodeIndex();
             nPamEndCI = pTmp->Start()->GetContentIndex();
             if (aOrigData.GetType() == RedlineType::Delete)
             {
@@ -3395,7 +3395,7 @@ bool 
DocumentRedlineManager::AcceptRedlineRange(SwRedlineTable::size_type nPosOr
                 m_rDoc.GetIDocumentUndoRedo().AppendUndo(
                     std::make_unique<SwUndoAcceptRedline>(*pTmp));
             }
-            nPamEndtNI = pTmp->Start()->GetNodeIndex();
+            nPamEndNI = pTmp->Start()->GetNodeIndex();
             nPamEndCI = pTmp->Start()->GetContentIndex();
             bRet |= lcl_AcceptRedline(maRedlineTable, nRdlIdx, bCallDelete);
             nRdlIdx++;
@@ -3631,7 +3631,7 @@ bool 
DocumentRedlineManager::RejectRedlineRange(SwRedlineTable::size_type nPosOr
 
     SwNodeOffset nPamStartNI = 
maRedlineTable[nPosStart]->Start()->GetNodeIndex();
     sal_Int32 nPamStartCI = 
maRedlineTable[nPosStart]->Start()->GetContentIndex();
-    SwNodeOffset nPamEndtNI = maRedlineTable[nPosEnd]->End()->GetNodeIndex();
+    SwNodeOffset nPamEndNI = maRedlineTable[nPosEnd]->End()->GetNodeIndex();
     sal_Int32 nPamEndCI = maRedlineTable[nPosEnd]->End()->GetContentIndex();
     do
     {
@@ -3642,8 +3642,8 @@ bool 
DocumentRedlineManager::RejectRedlineRange(SwRedlineTable::size_type nPosOr
                 && pTmp->Start()->GetContentIndex() < nPamStartCI))
             break;
 
-        if (pTmp->End()->GetNodeIndex() > nPamEndtNI
-            || (pTmp->End()->GetNodeIndex() == nPamEndtNI
+        if (pTmp->End()->GetNodeIndex() > nPamEndNI
+            || (pTmp->End()->GetNodeIndex() == nPamEndNI
                 && pTmp->End()->GetContentIndex() > nPamEndCI))
         {
         }
@@ -3669,7 +3669,7 @@ bool 
DocumentRedlineManager::RejectRedlineRange(SwRedlineTable::size_type nPosOr
 #endif
                 m_rDoc.GetIDocumentUndoRedo().AppendUndo(std::move(pUndoRdl));
             }
-            nPamEndtNI = pTmp->Start()->GetNodeIndex();
+            nPamEndNI = pTmp->Start()->GetNodeIndex();
             nPamEndCI = pTmp->Start()->GetContentIndex();
 
             if (bHierarchicalFormat && pTmp->GetType(1) == RedlineType::Insert)
@@ -3705,7 +3705,7 @@ bool 
DocumentRedlineManager::RejectRedlineRange(SwRedlineTable::size_type nPosOr
 #endif
                 m_rDoc.GetIDocumentUndoRedo().AppendUndo(std::move(pUndoRdl));
             }
-            nPamEndtNI = pTmp->Start()->GetNodeIndex();
+            nPamEndNI = pTmp->Start()->GetNodeIndex();
             nPamEndCI = pTmp->Start()->GetContentIndex();
             std::optional<SwPaM> oPam;
             RedlineType eInnerType = aOrigData.GetType();
@@ -3746,7 +3746,7 @@ bool 
DocumentRedlineManager::RejectRedlineRange(SwRedlineTable::size_type nPosOr
                     = std::make_unique<SwUndoRejectRedline>(*pTmp);
                 m_rDoc.GetIDocumentUndoRedo().AppendUndo(std::move(pUndoRdl));
             }
-            nPamEndtNI = pTmp->Start()->GetNodeIndex();
+            nPamEndNI = pTmp->Start()->GetNodeIndex();
             nPamEndCI = pTmp->Start()->GetContentIndex();
             bRet |= lcl_RejectRedline(maRedlineTable, nRdlIdx, bCallDelete);
             nRdlIdx++;