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

[Kohei Yoshida]

 patches/dev300/calc-selection-fixed-cursor.diff |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit a26eafc29fa094e14110661bbb63fd7b6d3a88e5
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Oct 22 12:46:00 2009 -0400

    Correct fix for the mirrored range selection bug in RTL mode.
    
    * patches/dev300/calc-selection-fixed-cursor.diff: my previous fix
      only worked part of the time.  This is hopefully the correct fix.
      (n#542684)

diff --git a/patches/dev300/calc-selection-fixed-cursor.diff b/patches/dev300/calc-selection-fixed-cursor.diff
index 6839f7e..89f9fdf 100644
--- a/patches/dev300/calc-selection-fixed-cursor.diff
+++ b/patches/dev300/calc-selection-fixed-cursor.diff
@@ -153,7 +153,7 @@ index 4cb00fb..3f80397 100644
      SCsCOLROW nRTLSign = 1;
      if ( pData->GetDocument()->IsLayoutRTL( pData->GetTabNo() ) )
      {
-@@ -172,38 +218,61 @@ void ScCellShell::GetStateCursor( SfxItemSet& /* rSet */ )
+@@ -172,38 +218,64 @@ void ScCellShell::GetStateCursor( SfxItemSet& /* rSet */ )
  
  void ScCellShell::ExecuteCursorSel( SfxRequest& rReq )
  {
@@ -179,7 +179,10 @@ index 4cb00fb..3f80397 100644
  
 -    switch ( nSlotId )
 +    // Horizontal direction depends on whether or not the UI language is RTL.
-+    SCsCOL nMovX = Application::GetSettings().GetLayoutRTL() ? -1 : 1;
++    SCsCOL nMovX = 1;
++    if (GetViewData()->GetDocument()->IsLayoutRTL(GetViewData()->GetTabNo()))
++        // mirror horizontal movement for right-to-left mode.
++        nMovX = -1;
 +
 +    switch (nSlotId)
      {