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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158613
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index b68bacbbef5c..532ea120ca2a 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -440,13 +440,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();