[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sc/source

[Markus Mohrhard]

 sc/source/ui/app/inputwin.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit eca7f703490cef3f6d09fae5a2c9e01d8f553760
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Aug 8 05:01:04 2016 +0200

    GetInputHdl may return nullptr
    
    As can be seen in the other places we need to check for nullptr.
    
    See
    http://crashreport.libreoffice.org/stats/crash_details/553b9ef5-c85f-4cda-b432-472501795634
    
    Change-Id: Ic5cab914f403fcae7f4e1e6f0e66c6295f7f56dd
    Reviewed-on: https://gerrit.libreoffice.org/27949
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit 8b86768a9a72ce6ef326615cb7c9ad5c76172921)
    Reviewed-on: https://gerrit.libreoffice.org/27979
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 86cf706..d64601f 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1056,7 +1056,8 @@ IMPL_LINK_NOARG_TYPED(ScInputBarGroup, ClickHdl, Button*, void)
     TriggerToolboxLayout();
 
     // Restore focus to input line(s) if necessary
-    if (  SC_MOD()->GetInputHdl()->IsTopMode() )
+    ScInputHandler* pHdl = SC_MOD()->GetInputHdl();
+    if ( pHdl && pHdl->IsTopMode() )
         maTextWnd->GrabFocus();
 }