summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-07-19 10:54:39 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-07-19 16:49:39 +0200
commit9c4d1503ba0ff97cdb113653b8dfe3ce66798ad5 (patch)
tree356bb5cd08c28718370db39afb1c5d8db588f9d2
parentfce3d0eec508c14beb2bc4ad3b7982abf6ec3c4a (diff)
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 <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/uibase/misc/redlndlg.cxx2
-rw-r--r--sw/source/uibase/shells/textfld.cxx2
2 files changed, 2 insertions, 2 deletions
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());