sw/source/uibase/misc/redlndlg.cxx | 2 +- sw/source/uibase/shells/textfld.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 9c4d1503ba0ff97cdb113653b8dfe3ce66798ad5 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Thu Jul 19 10:54:39 2018 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Thu Jul 19 16:49:39 2018 +0200 Resolves: tdf#118827 SetCareWin should be SetCareDialog Change-Id: I84c00a193e65a18b3ba82351c07be0b63e0cd5d4 Reviewed-on: https://gerrit.libreoffice.org/57719 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 1c1d40962749..b8590f525b7d 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -1125,8 +1125,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 a8fc344d7a56..a33b9a8b10fe 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -607,8 +607,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()); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits