[Libreoffice-commits] core.git: Branch 'libreoffice-3-6-7' - vcl/unx

[Abdulaziz A Alayed]

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit ebbe6b781151428272a0a3235f5eefc42c06a82e
Author: Abdulaziz A Alayed <aalayed at kacst.edu.sa>
Date:   Fri May 24 13:11:31 2013 +0300

    fdo#63254 UI:Horizontal scroll bar isn't displayed when RTL tab
    
    opened with LTR UI.
    
    Reviewed-on: https://gerrit.libreoffice.org/4024
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 898a3e84807bccbb876e3f5583728f6d24e05e9a)
    
    Conflicts:
    	vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
    
    Change-Id: Iff6899539fe0b1788df7b09f91f850b91bcdb811
    Reviewed-on: https://gerrit.libreoffice.org/4540
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Lior Kaplan <kaplanlior at gmail.com>
    Reviewed-by: Faisal al-otaibi <fmalotaibi at kacst.edu.sa>
    Tested-by: Faisal al-otaibi <fmalotaibi at kacst.edu.sa>
    Reviewed-by: Lior Kaplan <kaplanlior at gmail.com>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
old mode 100644
new mode 100755
index 9623555..c0d9740
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1027,7 +1027,13 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(  ControlType nType,
             rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1;
         if (!rNativeContentRegion.GetHeight())
             rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1;
-        returnVal = sal_True;
+        //fdo#63254 horizontal scrool bar isn't displayed in RTL tab
+        // with LTR UI in calc
+        returnVal =Application::GetSettings().GetLayoutRTL();
+
+        //See fdo#44582, Horizontal scrollbar in navigator window is broken
+        if ((nPart==PART_BUTTON_LEFT || nPart==PART_BUTTON_RIGHT) && Application::GetSettings().GetLayoutRTL())
+            returnVal = false;
     }
     if( (nType == CTRL_MENUBAR) && (nPart == PART_ENTIRE_CONTROL) )
     {