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

[Markus Mohrhard]

 sc/source/ui/app/inputhdl.cxx |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 588db4054bd820b98fefe22acac39add42480489
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Feb 22 20:34:00 2017 +0100

    fix crash in input handler code
    
    Reported by the crashreporter:
    http://crashreport.libreoffice.org/stats/signature/ScInputHandler::DataChanged(bool,bool)
    
    Change-Id: I3038f8b66e1009f4e418b2d7fd488533162ef9d5
    Reviewed-on: https://gerrit.libreoffice.org/34553
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 4c4bff70665a6327614fed38028935899f6b5e70)
    Reviewed-on: https://gerrit.libreoffice.org/34623
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index f268dbf..a372b87 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2298,10 +2298,15 @@ void ScInputHandler::DataChanged( bool bFromTopNotify, bool bSetModified )
         if ( pInputWin )
             pInputWin->SetTextString( aText );
 
-        ScDocShell* pDocSh = pActiveViewSh->GetViewData().GetDocShell();
-        ScDocument& rDoc = pDocSh->GetDocument();
         if ( comphelper::LibreOfficeKit::isActive() )
-            rDoc.GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_CELL_FORMULA, aText.toUtf8().getStr());
+        {
+            if (pActiveViewSh)
+            {
+                ScDocShell* pDocSh = pActiveViewSh->GetViewData().GetDocShell();
+                ScDocument& rDoc = pDocSh->GetDocument();
+                rDoc.GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_CELL_FORMULA, aText.toUtf8().getStr());
+            }
+        }
     }
 
     // If the cursor is before the end of a paragraph, parts are being pushed to