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

[Kohei Yoshida]

 patches/dev300/apply                              |    1 +
 patches/dev300/calc-paste-on-enter-crash-fix.diff |   13 +++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 390b0ce544dfca09e36d6cf4f03f7d12b988af87
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Oct 30 21:58:03 2009 -0400

    Don't paste on enter while in edit mode.
    
    * patches/dev300/apply:
    * patches/dev300/calc-paste-on-enter-crash-fix.diff: fixes
      i#102456.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 58b0118..5e00fab 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -760,6 +760,7 @@ enable-sheet-protection-options.diff, kohei
 
 # Paste clipboard when ENTER is pressed, then clear clipboard.
 sc-paste-on-enter.diff, n#358545, i#28535, jonp
+calc-paste-on-enter-crash-fix.diff, i#102456, kohei
 
 # Support copy & pasting of non-contiguous region.
 calc-multi-range-copy-paste.diff, n#447003, i#25855, kohei
diff --git a/patches/dev300/calc-paste-on-enter-crash-fix.diff b/patches/dev300/calc-paste-on-enter-crash-fix.diff
new file mode 100644
index 0000000..8d6b1d6
--- /dev/null
+++ b/patches/dev300/calc-paste-on-enter-crash-fix.diff
@@ -0,0 +1,13 @@
+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;
+         }
+     }
+-	else if( rKeyCode.GetCode() == KEY_RETURN && pViewData->IsPasteMode() )
++    else if( !SC_MOD()->IsInputMode() && rKeyCode.GetCode() == KEY_RETURN && pViewData->IsPasteMode() )
+ 	{
+ 		ScTabViewShell* pTabViewShell = pViewData->GetViewShell();
+