[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - editeng/source

[navin patidar]

 editeng/source/editeng/impedit3.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 065c8507bc6393468c0186370b1b991e22008b27
Author: navin patidar <patidar at kacst.edu.sa>
Date:   Sat Feb 2 08:40:30 2013 +0300

    fix fdo#59892 completely and fdo#33302 partially.
    
    fix fdo#33302 for rtl scripts in cal,impress and draw.
    
    Reviewed-on: https://gerrit.libreoffice.org/1961
    Reviewed-by: Ahmad Harthi <aalharthi at kacst.edu.sa>
    Tested-by: Ahmad Harthi <aalharthi at kacst.edu.sa>
    (cherry picked from commit 73de30ca9ca0d3d4edd00e0e8f22451238699989)
    
    fix logic to get L/R direction
    
    Reviewed-on: https://gerrit.libreoffice.org/1972
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>
    (cherry picked from commit fb697ed0ab6e0182b45c78412563c51d6f22f9d5)
    
    Change-Id: I21449d8ee236d798481fc61fbb1b4d12623cac90
    Signed-off-by: Lior Kaplan <kaplanlior at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/2728
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index b45c826..bada916 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4300,7 +4300,7 @@ void ImpEditEngine::ImplInitDigitMode( OutputDevice* pOutDev, String* pString, x
 void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 nPara, sal_uInt16 nIndex )
 {
     sal_Bool bCTL = sal_False;
-    sal_uInt8 bR2L = sal_False;
+    sal_Bool bR2L = sal_False;
     if ( nIndex == 0xFFFF )
     {
         bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
@@ -4311,8 +4311,9 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 nPara,
         ContentNode* pNode = GetEditDoc().GetObject( nPara );
         short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
         bCTL = nScriptType == i18n::ScriptType::COMPLEX;
-        bR2L = GetRightToLeft( nPara, nIndex + 1);  // this change was discussed in issue 37190
-                                                    // it also works for issue 55927
+        // this change was discussed in issue 37190
+        bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False;
+        // it also works for issue 55927
     }
 
     sal_uLong nLayoutMode = pOutDev->GetLayoutMode();