diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-06-20 23:20:33 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-06-20 23:20:33 +0200 |
commit | 4defbffb7654402cf6bbd4b8c3cb0d897ce88126 (patch) | |
tree | 23817ea004f4f946bba2efe2b3a8beb710217f4c | |
parent | 165ccab687d976d06afa0b02582065045132ee6d (diff) |
better fix for fdo#38455
-rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index a6735536a..d7d0764f3 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 ); |