[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - svtools/source

[Julien Nabet]

 svtools/source/control/filectrl.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e13650902068ca28cbe2bb1856f1a4c372f409bd
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Oct 23 23:42:35 2017 +0200

    tdf#113368: fix crash when closing dialog opened with Basic
    
    See bt https://bugs.documentfoundation.org/attachment.cgi?id=137222
    3  0x00007fffebe196b7 in vcl::Window::GrabFocus() (this=0x0) at /tinderbox/buildslave/source/libo-master/vcl/source/window/window.cxx:3003
    4  0x00007fffee473602 in FileControl::GetFocus() (this=0x28760b0) at /tinderbox/buildslave/source/libo-master/svtools/source/control/filectrl.cxx:177
    5  0x00007fffebe1c99b in vcl::Window::CompatGetFocus() (this=0x28760b0) at /tinderbox/buildslave/source/libo-master/vcl/source/window/window.cxx:3694
    6  0x00007fffebd62672 in vcl::Window::ImplGrabFocus(GetFocusFlags) (this=0x28760b0, nFlags=GetFocusFlags::NONE) at /tinderbox/buildslave/source/libo-master/vcl/source/window/mouse.cxx:377
    7  0x00007fffebe196b7 in vcl::Window::GrabFocus() (this=0x28760b0) at /tinderbox/buildslave/source/libo-master/vcl/source/window/window.cxx:3003
    8  0x00007fffebe0bfc5 in vcl::Window::dispose() (this=0x28778b0) at /tinderbox/buildslave/source/libo-master/vcl/source/window/window.cxx:449
    9  0x00007fffebe6536c in Control::dispose() (this=0x28778b0) at /tinderbox/buildslave/source/libo-master/vcl/source/control/ctrl.cxx:65
    10 0x00007fffebe6a4b6 in Edit::dispose() (this=0x28778b0) at /tinderbox/buildslave/source/libo-master/vcl/source/control/edit.cxx:265
    11 0x00007fffebfa5ac0 in VclReferenceBase::disposeOnce() (this=0x2877bc8) at /tinderbox/buildslave/source/libo-master/vcl/source/outdev/vclreferencebase.cxx:42
    12 0x00007fffee41f948 in VclPtr<Edit>::disposeAndClear() (this=0x28762c0) at /tinderbox/buildslave/source/libo-master/include/vcl/vclptr.hxx:208
    13 0x00007fffee472f0e in FileControl::dispose() (this=0x28760b0) at /tinderbox/buildslave/source/libo-master/svtools/source/control/filectrl.cxx:89
    
    Change-Id: I97fd3679a8692893047c22ff3e452a5c3e3f25c3
    Reviewed-on: https://gerrit.libreoffice.org/43731
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit fe22bdc3b537afa8ebcb5cb057542b762c770722)
    Reviewed-on: https://gerrit.libreoffice.org/43732
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 7fc74b545618..37d58075362b 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -174,6 +174,8 @@ void FileControl::Resize()
 
 void FileControl::GetFocus()
 {
+    if (!maEdit || maEdit->IsDisposed())
+        return;
     maEdit->GrabFocus();
 }