summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdulaziz A Alayed <aalayed@kacst.edu.sa>2013-05-24 13:11:31 +0300
committerMichael Stahl <mstahl@redhat.com>2013-07-09 12:45:58 +0200
commit27fc11754c9dc24e4b695a2b53bcd4f010c2be65 (patch)
treeab1b0f9d7ea91ff2821287e3eeaacd3e5f1fdd81
parent29a2c9e208facd1956fa2dd03d66c7ad8ae5deee (diff)
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@redhat.com> Tested-by: Stephan Bergmann <sbergman@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@canonical.com> Tested-by: Lior Kaplan <kaplanlior@gmail.com> Reviewed-by: Faisal al-otaibi <fmalotaibi@kacst.edu.sa> Tested-by: Faisal al-otaibi <fmalotaibi@kacst.edu.sa> Reviewed-by: Lior Kaplan <kaplanlior@gmail.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
-rwxr-xr-x[-rw-r--r--]vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 962355531193..c0d9740608ce 100644..100755
--- 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) )
{