[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-paste-on-enter-crash-fix.diff |   24 +++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 8a4d08ec440c3c5eaf664b5732eb79d2c6ed9896
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Sat Oct 31 13:36:35 2009 -0400

    This is the correct fix for the previous paste-on-enter bug.
    
    * patches/dev300/calc-paste-on-enter-crash-fix.diff: we should
      disable paste mode when the input mode is activated.
      (i#102456)

diff --git a/patches/dev300/calc-paste-on-enter-crash-fix.diff b/patches/dev300/calc-paste-on-enter-crash-fix.diff
index 8d6b1d6..4f81e2e 100644
--- a/patches/dev300/calc-paste-on-enter-crash-fix.diff
+++ b/patches/dev300/calc-paste-on-enter-crash-fix.diff
@@ -1,13 +1,15 @@
-diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
-index 1079b9d..b565db1 100644
---- sc/source/ui/view/gridwin.cxx
-+++ sc/source/ui/view/gridwin.cxx
-@@ -3064,7 +3064,7 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
-             return;
-         }
+diff --git sc/source/ui/app/inputhdl.cxx sc/source/ui/app/inputhdl.cxx
+index e5d46e5..2e450dd 100644
+--- sc/source/ui/app/inputhdl.cxx
++++ sc/source/ui/app/inputhdl.cxx
+@@ -2275,6 +2275,10 @@ void ScInputHandler::SetMode( ScInputMode eNewMode )
+         return;
      }
--	else if( rKeyCode.GetCode() == KEY_RETURN && pViewData->IsPasteMode() )
-+    else if( !SC_MOD()->IsInputMode() && rKeyCode.GetCode() == KEY_RETURN && pViewData->IsPasteMode() )
- 	{
- 		ScTabViewShell* pTabViewShell = pViewData->GetViewShell();
  
++    if (eNewMode != SC_INPUT_NONE)
++        // Disable paste mode when edit mode starts.
++        pActiveViewSh->GetViewData()->SetPasteMode( SC_PASTE_NONE );
++
+     bInOwnChange = TRUE;				// disable ModifyHdl (reset below)
+ 
+     ScInputMode eOldMode = eMode;