[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/uibase/shells/textfld.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 508cc73f5301abc00d1ed75e331a22eb01a65f09
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Apr 15 20:44:48 2023 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Apr 17 13:02:11 2023 +0200

    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 <xiscofa...@libreoffice.org>

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;
                 }