2 files changed, 21 insertions, 2 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelLabel.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelLabel.java
index 005eda62a7f9..d2dcfb078b87 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelLabel.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelLabel.java
@@ -31,9 +31,11 @@
 package org.openoffice.setup.PanelHelper;
 
 import java.awt.Color;
+import java.awt.ComponentOrientation;
 import java.awt.Font;
 import javax.swing.JTextArea;
 import javax.swing.UIManager;
+import org.openoffice.setup.InstallData;
 
 public class PanelLabel extends JTextArea {
 
@@ -66,6 +68,9 @@ public class PanelLabel extends JTextArea {
         setFont(TextFont);
         setFocusable(false);
 
+        InstallData data = InstallData.getInstance();
+        if ( data.useRtl() ) { setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); }
+
         if (multiline) {
             setLineWrap(true);
             setWrapStyleWord(true);
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelTitle.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelTitle.java
index 9b59bd3206ed..79f3d71bfc83 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelTitle.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/PanelHelper/PanelTitle.java
@@ -30,12 +30,14 @@
 
 package org.openoffice.setup.PanelHelper;
 
+import java.awt.ComponentOrientation;
 import java.awt.FlowLayout;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
+import org.openoffice.setup.InstallData;
 
 public class PanelTitle extends Box {
 
@@ -74,10 +76,17 @@ public class PanelTitle extends Box {
 
     private void init(String title, String subtitle, int rows, int columns) {
 
+        InstallData data = InstallData.getInstance();
+
         TitleLabel = new JLabel(title);
         TitleLabel.setFocusable(false);
         JPanel TitlePanel = new JPanel();
-        TitlePanel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        if ( data.useRtl() ) {
+            TitlePanel.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 0));
+            TitleLabel.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
+        } else {
+            TitlePanel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        }
         TitlePanel.add(TitleLabel);
 
         add(createVerticalStrut(10));
@@ -96,7 +105,12 @@ public class PanelTitle extends Box {
             SubtitleLabel.setFocusable(false);
             // PanelLabel SubtitleLabel = new PanelLabel(subtitle, true);
             JPanel SubtitlePanel = new JPanel();
-            SubtitlePanel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
+            if ( data.useRtl() ) {
+                SubtitlePanel.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 0));
+                SubtitleLabel.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
+            } else {
+                SubtitlePanel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
+            }
             SubtitlePanel.add(SubtitleLabel);
 
             add(SubtitlePanel);