From 4a02c63d1431b2e8686a035e119c4a2f5c972592 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Sat, 10 Jul 2010 18:21:24 +0200
Subject: CWS changehid: #i111874#: change code to support HelpIds as byte
 strings

---
 sc/source/ui/pagedlg/hfedtdlg.src | 48 +++++++++++++++++++--------------------
 sc/source/ui/pagedlg/tphf.cxx     |  6 ++---
 2 files changed, 26 insertions(+), 28 deletions(-)

(limited to 'sc/source/ui/pagedlg')

diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src
index 1445636e8cc6..7e70dd9bfe66 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.src
+++ b/sc/source/ui/pagedlg/hfedtdlg.src
@@ -70,13 +70,13 @@ TabDialog RID_SCDLG_HFED_HEADER
             {
                 Identifier = 1 ;
                 HEADER_RIGHT
-                PageResID = HID_SCPAGE_HFED_HR ;
+                PageResID = RID_SCPAGE_HFED_HR ;
             };
             PageItem
             {
                 Identifier = 2 ;
                 HEADER_LEFT
-                PageResID = HID_SCPAGE_HFED_HL ;
+                PageResID = RID_SCPAGE_HFED_HL ;
             };
         };
     };
@@ -101,13 +101,13 @@ TabDialog RID_SCDLG_HFED_FOOTER
             {
                 Identifier = 1 ;
                 FOOTER_RIGHT
-                PageResID = HID_SCPAGE_HFED_FR ;
+                PageResID = RID_SCPAGE_HFED_FR ;
             };
             PageItem
             {
                 Identifier = 2 ;
                 FOOTER_LEFT
-                PageResID = HID_SCPAGE_HFED_FL ;
+                PageResID = RID_SCPAGE_HFED_FL ;
             };
         };
     };
@@ -135,25 +135,25 @@ TabDialog RID_SCDLG_HFEDIT_ALL
             {
                 Identifier = 1 ;
                 HEADER_RIGHT
-                PageResID = HID_SCPAGE_HFED_HR ;
+                PageResID = RID_SCPAGE_HFED_HR ;
             };
             PageItem
             {
                 Identifier = 2 ;
                 HEADER_LEFT
-                PageResID = HID_SCPAGE_HFED_HL ;
+                PageResID = RID_SCPAGE_HFED_HL ;
             };
             PageItem
             {
                 Identifier = 3 ;
                 FOOTER_RIGHT
-                PageResID = HID_SCPAGE_HFED_FR ;
+                PageResID = RID_SCPAGE_HFED_FR ;
             };
             PageItem
             {
                 Identifier = 4 ;
                 FOOTER_LEFT
-                PageResID = HID_SCPAGE_HFED_FL ;
+                PageResID = RID_SCPAGE_HFED_FL ;
             };
         };
     };
@@ -178,19 +178,19 @@ TabDialog RID_SCDLG_HFEDIT_SHDR
             {
                 Identifier = 1 ;
                 HEADER
-                PageResID = HID_SCPAGE_HFED_HR ;
+                PageResID = RID_SCPAGE_HFED_HR ;
             };
             PageItem
             {
                 Identifier = 2 ;
                 FOOTER_RIGHT
-                PageResID = HID_SCPAGE_HFED_FR ;
+                PageResID = RID_SCPAGE_HFED_FR ;
             };
             PageItem
             {
                 Identifier = 3 ;
                 FOOTER_LEFT
-                PageResID = HID_SCPAGE_HFED_FL ;
+                PageResID = RID_SCPAGE_HFED_FL ;
             };
         };
     };
@@ -215,19 +215,19 @@ TabDialog RID_SCDLG_HFEDIT_SFTR
             {
                 Identifier = 1 ;
                 HEADER_RIGHT
-                PageResID = HID_SCPAGE_HFED_HR ;
+                PageResID = RID_SCPAGE_HFED_HR ;
             };
             PageItem
             {
                 Identifier = 2 ;
                 HEADER_LEFT
-                PageResID = HID_SCPAGE_HFED_HL ;
+                PageResID = RID_SCPAGE_HFED_HL ;
             };
             PageItem
             {
                 Identifier = 3 ;
                 FOOTER
-                PageResID = HID_SCPAGE_HFED_FR ;
+                PageResID = RID_SCPAGE_HFED_FR ;
             };
         };
     };
@@ -252,13 +252,13 @@ TabDialog RID_SCDLG_HFEDIT
             {
                 Identifier = 1 ;
                 HEADER
-                PageResID = HID_SCPAGE_HFED_HR ;
+                PageResID = RID_SCPAGE_HFED_HR ;
             };
             PageItem
             {
                 Identifier = 2 ;
                 FOOTER
-                PageResID = HID_SCPAGE_HFED_FR ;
+                PageResID = RID_SCPAGE_HFED_FR ;
             };
         };
     };
@@ -283,13 +283,13 @@ TabDialog RID_SCDLG_HFEDIT_HEADER
             {
                 Identifier = 1 ;
                 HEADER_RIGHT
-                PageResID = HID_SCPAGE_HFED_HR ;
+                PageResID = RID_SCPAGE_HFED_HR ;
             };
             PageItem
             {
                 Identifier = 2 ;
                 HEADER_LEFT
-                PageResID = HID_SCPAGE_HFED_HL ;
+                PageResID = RID_SCPAGE_HFED_HL ;
             };
         };
     };
@@ -314,13 +314,13 @@ TabDialog RID_SCDLG_HFEDIT_FOOTER
             {
                 Identifier = 1 ;
                 FOOTER_RIGHT
-                PageResID = HID_SCPAGE_HFED_FR ;
+                PageResID = RID_SCPAGE_HFED_FR ;
             };
             PageItem
             {
                 Identifier = 2 ;
                 FOOTER_LEFT
-                PageResID = HID_SCPAGE_HFED_FL ;
+                PageResID = RID_SCPAGE_HFED_FL ;
             };
         };
     };
@@ -345,7 +345,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTHEADER
             {
                 Identifier = 1 ;
                 HEADER_RIGHT
-                PageResID = HID_SCPAGE_HFED_HR ;
+                PageResID = RID_SCPAGE_HFED_HR ;
             };
         };
     };
@@ -370,7 +370,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTHEADER
             {
                 Identifier = 1 ;
                 HEADER_LEFT
-                PageResID = HID_SCPAGE_HFED_HL ;
+                PageResID = RID_SCPAGE_HFED_HL ;
             };
         };
     };
@@ -395,7 +395,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTFOOTER
             {
                 Identifier = 1 ;
                 FOOTER_RIGHT
-                PageResID = HID_SCPAGE_HFED_FR ;
+                PageResID = RID_SCPAGE_HFED_FR ;
             };
         };
     };
@@ -420,7 +420,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTFOOTER
             {
                 Identifier = 1 ;
                 FOOTER_LEFT
-                PageResID = HID_SCPAGE_HFED_FL ;
+                PageResID = RID_SCPAGE_HFED_FL ;
             };
         };
     };
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 86f06246794e..de647cf5f82a 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -98,11 +98,9 @@ ScHFPage::ScHFPage( Window* pParent, USHORT nResId,
     aTurnOnBox.SetClickHdl  ( LINK( this, ScHFPage, TurnOnHdl ) );
 
     if ( nId == SID_ATTR_PAGE_HEADERSET )
-        // FIXME: HELPID
-        aBtnEdit.SetHelpId( ""/*HID_SC_HEADER_EDIT*/ );
+        aBtnEdit.SetHelpId( HID_SC_HEADER_EDIT );
     else
-        // FIXME: HELPID
-        aBtnEdit.SetHelpId( ""/*HID_SC_FOOTER_EDIT*/ );
+        aBtnEdit.SetHelpId( HID_SC_FOOTER_EDIT );
 }
 
 //------------------------------------------------------------------
-- 
cgit