[Libreoffice-commits] core.git: Branch 'libreoffice-7-1-1' - editeng/source

[Julien Nabet (via logerrit)]

 editeng/source/editeng/editview.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 9b48f981807995d932ee36bd1f5b7972c72f871d
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Feb 14 21:17:10 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Feb 17 10:29:30 2021 +0100

    tdf#140414: fix Crash pressing Ctrl-K in input line in Calc
    
    3  0x00007ff38b819d73 in vcl::Window::GetPointerPosPixel() (this=0x0) at vcl/source/window/mouse.cxx:552
    4  0x00007ff3925fe7c1 in EditView::GetFieldUnderMousePointer(int&, int&) const (this=0x4c37160, nPara=@0x7ffd982b4f44: 0, nPos=@0x7ffd982b4f40: 57752960) at editeng/source/editeng/editview.cxx:1325
    5  0x00007ff3925fe74a in EditView::GetFieldUnderMousePointer() const (this=0x4c37160) at editeng/source/editeng/editview.cxx:1315
    6  0x00007ff3925fec4c in EditView::GetFieldAtCursor() const (this=0x4c37160) at editeng/source/editeng/editview.cxx:1384
    7  0x00007ff377f6aa55 in ScEditShell::GetURLField() (this=0x37a31a0) at sc/source/ui/view/editsh.cxx:833
    
    Change-Id: Ib369644f26eec4f37a34213f0b0113359a653098
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110860
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 35965e1e276a..8e7c62f224e6 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1273,7 +1273,10 @@ const SvxFieldItem* EditView::GetField( const Point& rPos, sal_Int32* pPara, sal
 
 const SvxFieldItem* EditView::GetFieldUnderMousePointer( sal_Int32& nPara, sal_Int32& nPos ) const
 {
-    Point aPos = pImpEditView->GetWindow()->GetPointerPosPixel();
+    auto pWin = pImpEditView->GetWindow();
+    if (!pWin)
+        return nullptr;
+    Point aPos = pWin->GetPointerPosPixel();
     aPos = pImpEditView->GetWindow()->PixelToLogic( aPos );
     return GetField( aPos, &nPara, &nPos );
 }