[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Libreoffice Gerrit user]

 sw/source/uibase/misc/redlndlg.cxx  |    2 +-
 sw/source/uibase/shells/textfld.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 80e083c17422c464981d959b87589a5efc987dd8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 19 10:54:39 2018 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Jul 19 22:05:25 2018 +0200

    Resolves: tdf#118827 SetCareWin should be SetCareDialog
    
    Change-Id: I84c00a193e65a18b3ba82351c07be0b63e0cd5d4
    Reviewed-on: https://gerrit.libreoffice.org/57720
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index e6de1254c8b6..645956b731e9 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -1128,8 +1128,8 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl, SvSimpleTable*, void)
                 m_pTable->SetEntryText(sMsg.replace('\n', ' '), pEntry, 3);
             }
 
-            pDlg.disposeAndClear();
             SwViewShell::SetCareDialog(nullptr);
+            pDlg.disposeAndClear();
         }
     }
     else if (nRet)
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index d5d68916c371..9d89701232a1 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -617,8 +617,8 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                         rSh.SetRedlineComment(sMsg);
                     }
 
+                    SwViewShell::SetCareDialog(nullptr);
                     pDlg.disposeAndClear();
-                    SwViewShell::SetCareWin(nullptr);
                     g_bNoInterrupt = false;
                     rSh.ClearMark();
                     GetView().AttrChangedNotify(GetShellPtr());