diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-06-20 23:20:33 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-06-21 10:08:51 +0200 |
| commit | 556838a24b2ac018d1ffb24e46b1b8de731dc903 (patch) | |
| tree | ed94dcbea9ba682f8ef1e54f5be0cebf35d34144 | |
| parent | d46d716461812e03f1bc8541aa8b486a4f7f54ba (diff) | |
better fix for fdo#38455
Signed-off-by: Petr Mladek <pmladek@suse.cz>
| -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 329bf960b..abe74d73e 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2066,7 +2066,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 ) @@ -2283,7 +2284,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 ); |