[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - svtools/source

Maxim Monastirsky momonasmon at gmail.com
Fri Nov 3 13:00:44 UTC 2017


 svtools/source/brwbox/ebbcontrols.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit aa302e7decc945dfac389b858d2d513129527b5a
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Thu Jan 5 14:05:39 2017 +0200

    tdf#105121 Crash in GrabFocus during dispose
    
    Change-Id: I03a001f5c670e0ca2c6d78fcf726ea5a46a93eab
    (cherry picked from commit fae07692473f0e29e469b1da5d767fc9203dd22c)

diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 0271ff821527..0e6248212166 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -289,7 +289,8 @@ namespace svt
 
     void CheckBoxControl::GetFocus()
     {
-        pBox->GrabFocus();
+        if (pBox)
+            pBox->GrabFocus();
     }
 
 


More information about the Libreoffice-commits mailing list