[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/cws-koheicopyborder-sc.diff |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 07111fca568ecb76a941c231af94a4f29f5f2a75
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Sat Oct 31 13:45:30 2009 -0400

    Disable paste mode when the input mode is activated.
    
    * patches/dev300/cws-koheicopyborder-sc.diff: this is the
      correct fix for i#102456.

diff --git a/patches/dev300/cws-koheicopyborder-sc.diff b/patches/dev300/cws-koheicopyborder-sc.diff
index 0777a0e..9a61481 100644
--- a/patches/dev300/cws-koheicopyborder-sc.diff
+++ b/patches/dev300/cws-koheicopyborder-sc.diff
@@ -10,6 +10,17 @@ index 85104d0..af14c64 100644
      bInOwnChange = TRUE;				// disable ModifyHdl (reset in DataChanged)
  
      if ( eMode == SC_INPUT_NONE )
+@@ -2275,6 +2275,10 @@ void ScInputHandler::SetMode( ScInputMode eNewMode )
+         return;
+     }
+ 
++    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;
 diff --git sc/source/ui/inc/gridwin.hxx sc/source/ui/inc/gridwin.hxx
 index 4013e1a..4c701ad 100644
 --- sc/source/ui/inc/gridwin.hxx
@@ -240,7 +251,7 @@ index 42b22a6..5e389ef 100644
              return;
          }
      }
-+    else if( !SC_MOD()->IsInputMode() && rKeyCode.GetCode() == KEY_RETURN && pViewData->IsPasteMode() )
++    else if( rKeyCode.GetCode() == KEY_RETURN && pViewData->IsPasteMode() )
 +    {
 +        ScTabViewShell* pTabViewShell = pViewData->GetViewShell();
 +