summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2023-04-15 20:44:48 +0100
committerXisco Fauli <xiscofauli@libreoffice.org>2023-04-26 13:05:55 +0200
commitb4b13f0bbf95497c7addd7026c602074aa0725de (patch)
treecbf7f4d2add14b3c827b220f771924531ce0f661
parentupdate credits (diff)
downloadcore-b4b13f0bbf95497c7addd7026c602074aa0725de.tar.gz
core-b4b13f0bbf95497c7addd7026c602074aa0725de.zip
tdf#137542 don't crash at least
doesn't address the underlying issue though Change-Id: I7f5a5dba01c399ec78eceaab6ea85fc0b8897927 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150328 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 62f52e4baa215724a7ed44aedb3c79464defed17) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150506 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Stéphane Guillou <stephane.guillou@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
-rw-r--r--sw/source/uibase/shells/textfld.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 1efdf57abed0..1d32fef4934f 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -187,9 +187,9 @@ void SwTextShell::ExecField(SfxRequest &rReq)
SwCursorShell::StartOfInputFieldAtPos( *(rSh.GetCursor()->Start()) ) + 1,
SwCursorShell::EndOfInputFieldAtPos( *(rSh.GetCursor()->Start()) ) - 1 );
}
- else
+ else if (SwField* pCurrentField = rSh.GetCurField(true))
{
- rSh.StartInputFieldDlg(rSh.GetCurField(true), false, false, GetView().GetFrameWeld());
+ rSh.StartInputFieldDlg(pCurrentField, false, false, GetView().GetFrameWeld());
}
bRet = true;
}