reenable left/right area swap in .ui layout terms

Change-Id: Ic680a0e9f0254722163c1bd1b822d1c51f96454f

5 files changed, 17 insertions, 59 deletions

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index ae9629fafaa7..7dc6cd64837e 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -509,14 +509,6 @@
 #define STR_CHANGED_MOVE_REJECTION_WARNING      402
 #define STR_CHANGED_DELETE_REJECTION_WARNING    403
 
-// #define STR_HF_NONE_IN_BRACKETS     404
-// #define STR_HF_OF                   405
-// #define STR_HF_OF_QUESTION          406
-// #define STR_HF_CREATED_BY           407
-// #define STR_HF_CONFIDENTIAL         408
-// #define STR_HF_CUSTOMIZED           409
-//#define STR_HF_CUSTOM_FOOTER        410
-
 #define STR_ERR_DATAPILOT_INPUT     411
 
 #define STR_DIV_ZERO                412     /* moved to compiler.src, keep define! */
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 8300e45086c5..5c6fc5c2b45e 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -76,7 +76,6 @@
 #define HID_SCPAGE_CALC                                         "SC_HID_SCPAGE_CALC"
 #define HID_SCPAGE_FORMULA                                      "SC_HID_SCPAGE_FORMULA"
 #define HID_SCPAGE_USERLISTS                                    "SC_HID_SCPAGE_USERLISTS"
-#define HID_SCPAGE_HFEDIT                                       "SC_HID_SCPAGE_HFEDIT"
 #define HID_SCPAGE_AREAS                                        "SC_HID_SCPAGE_AREAS"
 #define HID_SCPAGE_COMPATIBILITY                                "SC_HID_SCPAGE_COMPATIBILITY"
 #define HID_SCPAGE_PRINT                                        "SC_HID_SCPAGE_PRINT"
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx
index 0c3a0d8080d9..40476da70a7e 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -61,11 +61,8 @@ protected:
     virtual     ~ScHFEditPage();
 
 private:
-    //FixedText       aFtLeft;
     ScEditWindow*    m_pWndLeft;
-    //FixedText       aFtCenter;
     ScEditWindow*    m_pWndCenter;
-    //FixedText       aFtRight;
     ScEditWindow*    m_pWndRight;
     FixedText*       m_pFtDefinedHF;
     ListBox*         m_pLbDefined;
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 342774a3a0f4..bc4b07125fd9 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -119,18 +119,23 @@ ScHFEditPage::ScHFEditPage( Window*             pParent,
     m_pFtDefinedHF->Show();
     m_pFtCustomHF->Show();
 
-//     if( Application::GetSettings().GetLayoutRTL() )
-//     {
-//         Point pt1 = m_pWndLeft->GetPosPixel();
-//         Point pt2 = m_pWndRight->GetPosPixel();
-//         m_pWndLeft->SetPosPixel(pt2);
-//         m_pWndRight->SetPosPixel(pt1);
-//
-//         pt1 = aFtLeft.GetPosPixel();
-//         pt2 = aFtRight.GetPosPixel();
-//         aFtLeft.SetPosPixel(pt2);
-//         aFtRight.SetPosPixel(pt1);
-//    }
+    //swap left/right areas and their lables in RTL mode
+    if( Application::GetSettings().GetLayoutRTL() )
+    {
+        Window *pLeft = get<Window>("labelFT_LEFT");
+        Window *pRight = get<Window>("labelFT_RIGHT");
+        sal_Int32 nOldLeftAttach = pLeft->get_grid_left_attach();
+        sal_Int32 nOldRightAttach = pRight->get_grid_left_attach();
+        pLeft->set_grid_left_attach(nOldRightAttach);
+        pRight->set_grid_left_attach(nOldLeftAttach);
+
+        pLeft = m_pWndLeft;
+        pRight = m_pWndRight;
+        nOldLeftAttach = pLeft->get_grid_left_attach();
+        nOldRightAttach = pRight->get_grid_left_attach();
+        pLeft->set_grid_left_attach(nOldRightAttach);
+        pRight->set_grid_left_attach(nOldLeftAttach);
+    }
     m_pWndLeft->SetFont( aPatAttr );
     m_pWndCenter->SetFont( aPatAttr );
     m_pWndRight->SetFont( aPatAttr );
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index a4a60187b32b..b9ffd2a79388 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1619,41 +1619,6 @@ Resource RID_GLOBSTR
         Text[ en-US ] = "WARNING: This action may have resulted in references to the deleted area not being restored.";
     };
 
-//     String STR_HF_NONE_IN_BRACKETS
-//     {
-//         Text [ en-US ] = "(none)";
-//     };
-//
-//     String STR_HF_OF
-//     {
-//         Text [ en-US ] = "of";
-//     };
-//
-//     String STR_HF_OF_QUESTION
-//     {
-//         Text [ en-US ] = "of ?";
-//     };
-//
-//     String STR_HF_CREATED_BY
-//     {
-//         Text [ en-US ] = "Created by";
-//     };
-//
-//     String STR_HF_CONFIDENTIAL
-//     {
-//         Text [ en-US ] = "Confidential";
-//     };
-//
-//     String STR_HF_CUSTOMIZED
-//     {
-//         Text [ en-US ] = "Customized";
-//     };
-
-//     String STR_HF_CUSTOM_FOOTER
-//     {
-//         Text [ en-US ] = "Custom footer";
-//     };
-
     String STR_UNDO_CHINESE_TRANSLATION
     {
         Text [ en-US ] = "Chinese conversion";