[Libreoffice-commits] .: 2 commits - sc/source

[Markus Mohrhard]

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

New commits:
commit 97d523a299c184d29792b7e1c575475fe2632f04
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Jun 21 07:34:01 2011 +0200

    remove first fix for fdo#38455
    
    better fix already pushed

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index d7d0764..c7a89f2 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3082,7 +3082,7 @@ sal_Bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, sal_Bool bStartEdit /*
     sal_Bool bCursorKey = EditEngine::DoesKeyMoveCursor(rKEvt);
     sal_Bool bInsKey = ( nCode == KEY_INSERT && !nModi );	// Insert wie Cursortasten behandeln
     if ( !bUsed && !bSkip && ( bDoEnter || EditEngine::DoesKeyChangeText(rKEvt) ||
-                    ( eMode != SC_INPUT_NONE && ( bCursorKey || bInsKey ) ) ) && pActiveViewSh)
+                    ( eMode != SC_INPUT_NONE && ( bCursorKey || bInsKey ) ) ) )
     {
         HideTip();
         HideTipBelow();
commit 4defbffb7654402cf6bbd4b8c3cb0d897ce88126
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Jun 20 23:20:33 2011 +0200

    better fix for fdo#38455

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index a673553..d7d0764 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2065,7 +2065,8 @@ IMPL_LINK( ScInputHandler, ModifyHdl, void *, EMPTYARG )
 
 sal_Bool ScInputHandler::DataChanging( sal_Unicode cTyped, sal_Bool bFromCommand )		// return sal_True = new view created
 {
-    pActiveViewSh->GetViewData()->SetPasteMode( SC_PASTE_NONE );
+    if (pActiveViewSh)
+        pActiveViewSh->GetViewData()->SetPasteMode( SC_PASTE_NONE );
     bInOwnChange = true;				// disable ModifyHdl (reset in DataChanged)
 
     if ( eMode == SC_INPUT_NONE )
@@ -2282,7 +2283,7 @@ void ScInputHandler::SetMode( ScInputMode eNewMode )
         return;
     }
 
-    if (eNewMode != SC_INPUT_NONE)
+    if (eNewMode != SC_INPUT_NONE && pActiveViewSh)
         // Disable paste mode when edit mode starts.
         pActiveViewSh->GetViewData()->SetPasteMode( SC_PASTE_NONE );