[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source

[Attila Szűcs (via logerrit)]

 sw/source/uibase/misc/redlndlg.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 6c3cf5c000ce8c1e82bd834995d1ee52f8c2baeb
Author:     Attila Szűcs <attila.sz...@collabora.com>
AuthorDate: Wed Oct 25 13:09:22 2023 +0200
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Oct 26 09:32:18 2023 +0200

    SW: small fix for manage changes dialog.
    
    Fixed a continue, as it was planned to effect the outer loop.
    (probably when it was replaced to an inner loop it was forgot to handle)
    
    fixed a nullptr check also.
    
    These problems may not result real problem right now,
    but when interdependedt redlines will be improved,
    they will result in problems.
    
    Change-Id: Ie139f9a657abbacea9450176d2fe138392beddfa
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158457
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/uibase/misc/redlndlg.cxx 
b/sw/source/uibase/misc/redlndlg.cxx
index de5310de0311..401998451fc4 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -434,13 +434,16 @@ void SwRedlineAcceptDlg::Activate()
         {
             while (pRedlineData)
             {
-                if (pRedlineData != pBackupData->pChild)
+                if (!pBackupData || pRedlineData != pBackupData->pChild)
                 {
                     // Redline-Children were inserted, changed or deleted
                     i = CalcDiff(i, true);
                     if (i == SwRedlineTable::npos)
                         return;
-                    continue;
+
+                    // here was a continue; targetted to the outer loop
+                    // now a break will do, as there is nothing after it in 
the outer loop
+                    break;
                 }
                 pBackupData = pBackupData->pNext;
                 pRedlineData = pRedlineData->Next();