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

[navin patidar]

 sd/source/ui/annotations/annotationwindow.cxx |    5 +----
 sw/source/ui/docvw/SidebarWin.cxx             |    5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit d91b5e739128cd8f4c3ef86c17cd723d5b292a2d
Author: navin patidar <patidar at kacst.edu.sa>
Date:   Tue Mar 19 08:58:22 2013 +0300

    fix fdo#62050 : Initially disable RTL for comment window.
    
    In RTL UI, comment window is RTL and editbox’s (editeng) default writing
    direction is LTR.
    and i suspect, the bug is result of this RTL & LTR mix-up.
    
    Change-Id: If3af4ae428b67151d66661907b9e60a97049e0e6
    Reviewed-on: https://gerrit.libreoffice.org/2831
    Reviewed-by: abdulmajeed ahmed <aalabdulrazzaq at kacst.edu.sa>
    Reviewed-by: Ahmad Harthi <aalharthi at kacst.edu.sa>
    Tested-by: Ahmad Harthi <aalharthi at kacst.edu.sa>
    (cherry picked from commit 79dd315e9b19ec3bc6601c359a0ecb6d576d4aa8)
    
    Signed-off-by: Lior Kaplan <kaplanlior at gmail.com>
    
    fix fdo#62050: for impress
    
    Impress is also affected by fdo#62050.
    In RTL UI, comment window is RTL and editbox’s (editeng) default
    writing direction is LTR.
    I suspect, bug is result of this RTL & LTR mix-up.
    
    Change-Id: I188ce05350f721081378509915158d4ec4e5f8cf
    Reviewed-on: https://gerrit.libreoffice.org/2922
    Reviewed-by: Ahmad Harthi <aalharthi at kacst.edu.sa>
    Tested-by: Ahmad Harthi <aalharthi at kacst.edu.sa>
    (cherry picked from commit 092bf2fb0052ca73855127dc03ff1ae3f9321506)
    
    Signed-off-by: Lior Kaplan <kaplanlior at gmail.com>

diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index d217cbf..6573ea0 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -327,15 +327,12 @@ void AnnotationWindow::InitControls()
         mpOutliner->SetRefDevice( pDev );
     }
 
+    mpTextWindow->EnableRTL( sal_False );
     mpOutlinerView = new OutlinerView ( mpOutliner, mpTextWindow );
     mpOutliner->InsertView(mpOutlinerView );
     mpTextWindow->SetOutlinerView(mpOutlinerView);
     mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,1,1) ) );
 
-    // TODO: ??
-    EEHorizontalTextDirection aDefHoriTextDir = Application::GetSettings().GetLayoutRTL() ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R;
-    mpOutliner->SetDefaultHorizontalTextDirection( aDefHoriTextDir );
-
     //create Scrollbars
     mpVScrollbar = new ScrollBar(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG);
     mpVScrollbar->EnableNativeWidget(false);
diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx
index 8ad2c15..c0417ad 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -320,6 +320,7 @@ void SwSidebarWin::InitControls()
     mpOutliner->SetUpdateMode( sal_True );
     Rescale();
 
+    mpSidebarTxtControl->EnableRTL( sal_False );
     mpOutlinerView = new OutlinerView ( mpOutliner, mpSidebarTxtControl );
     mpOutlinerView->SetBackgroundColor(COL_TRANSPARENT);
     mpOutliner->InsertView(mpOutlinerView );
@@ -327,10 +328,6 @@ void SwSidebarWin::InitControls()
 
     mpOutlinerView->SetAttribs(DefaultItem());
 
-    // TODO: ??
-    EEHorizontalTextDirection aDefHoriTextDir = Application::GetSettings().GetLayoutRTL() ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R;
-    mpOutliner->SetDefaultHorizontalTextDirection( aDefHoriTextDir );
-
     //create Scrollbars
     mpVScrollbar = new ScrollBar(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG);
     mpVScrollbar->EnableNativeWidget(false);