summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIssa Alkurtass <ialkurtass@kacst.edu.sa>2013-02-10 09:32:39 +0300
committerMichael Meeks <michael.meeks@suse.com>2013-02-11 16:10:59 +0000
commit3b928bee03e4d311f29eaf63a11c12798559b2c9 (patch)
tree7d7692f3d02629c8d7d3ab2bf79f40d4d4cf4963
parent768a72217e1d5b5253855b6e98adefdf7bf6973e (diff)
fdo#39370 - Fixed RTL/LTR and alignment buttons location on RTL interface
Reversed the location of the RTL and LTR buttons as well as the align right and align left buttons on the RTL interface. It now matches the LTR interface. Done from toolboxdocumenthandler instead of modifying 20+ xml files. Change-Id: I6b3715e134bb45a7500b87a9e926d7940690a9af Reviewed-on: https://gerrit.libreoffice.org/2077 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
-rw-r--r--framework/source/fwe/xml/toolboxdocumenthandler.cxx17
1 files changed, 17 insertions, 0 deletions
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index b57d158a0900..7826ac2e40f0 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -423,6 +423,23 @@ throw( SAXException, RuntimeException )
aToolbarItemProp[5].Name = m_aIsVisible;
aToolbarItemProp[6].Name = m_aTooltip;
+ //fix for fdo#39370
+ /// check whether RTL interface or not
+ if(Application::GetSettings().GetLayoutRTL()){
+ if (aCommandURL.compareTo(".uno:ParaLeftToRight") == 0)
+ aCommandURL = ".uno:ParaRightToLeft";
+ else if (aCommandURL.compareTo(".uno:ParaRightToLeft") == 0)
+ aCommandURL = ".uno:ParaLeftToRight";
+ else if (aCommandURL.compareTo(".uno:LeftPara") == 0)
+ aCommandURL = ".uno:RightPara";
+ else if (aCommandURL.compareTo(".uno:RightPara") == 0)
+ aCommandURL = ".uno:LeftPara";
+ else if (aCommandURL.compareTo(".uno:AlignLeft") == 0)
+ aCommandURL = ".uno:AlignRight";
+ else if (aCommandURL.compareTo(".uno:AlignRight") == 0)
+ aCommandURL = ".uno:AlignLeft";
+ }
+
aToolbarItemProp[0].Value <<= aCommandURL;
aToolbarItemProp[1].Value <<= aHelpURL;
aToolbarItemProp[2].Value <<= aLabel;