CWS changehid: #i111874#: change code to support HelpIds as byte strings

4 files changed, 16 insertions, 25 deletions

diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index c7878d071c4d..279ce515c1d9 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -173,14 +173,12 @@ SwEnvDlg::SwEnvDlg(Window* pParent, const SfxItemSet& rSet,
     FreeResource();
 
     GetOKButton().SetText(String(SW_RES(STR_BTN_NEWDOC)));
-    // FIXME: HELPID
-    GetOKButton().SetHelpId(""/*HID_ENVELOP_PRINT*/);
+    GetOKButton().SetHelpId(HID_ENVELOP_PRINT);
     GetOKButton().SetHelpText(aEmptyStr);   // Damit generierter Hilfetext verwendet wird
     if (GetUserButton())
     {
         GetUserButton()->SetText(bInsert ? sInsert : sChange);
-        // FIXME: HELPID
-        GetUserButton()->SetHelpId(""/*HID_ENVELOP_INSERT*/);
+        GetUserButton()->SetHelpId(HID_ENVELOP_INSERT);
     }
 
     AddTabPage(TP_ENV_ENV, SwEnvPage   ::Create, 0);
diff --git a/sw/source/ui/envelp/envprt.src b/sw/source/ui/envelp/envprt.src
index f671c9506dc6..ef517a6ca1f5 100644
--- a/sw/source/ui/envelp/envprt.src
+++ b/sw/source/ui/envelp/envprt.src
@@ -49,32 +49,32 @@ TabPage TP_ENV_PRT
             ToolBoxItem
             {
                 Identifier = ITM_HOR_LEFT ;
-                HelpID = ITM_HOR_LEFT ;
+                HelpID = HID_ITM_HOR_LEFT ;
             };
             ToolBoxItem
             {
                 Identifier = ITM_HOR_CNTR ;
-                HelpID = ITM_HOR_CNTR ;
+                HelpID = HID_ITM_HOR_CNTR ;
             };
             ToolBoxItem
             {
                 Identifier = ITM_HOR_RGHT ;
-                HelpID = ITM_HOR_RGHT ;
+                HelpID = HID_ITM_HOR_RGHT ;
             };
             ToolBoxItem
             {
                 Identifier = ITM_VER_LEFT ;
-                HelpID = ITM_VER_LEFT ;
+                HelpID = HID_ITM_VER_LEFT ;
             };
             ToolBoxItem
             {
                 Identifier = ITM_VER_CNTR ;
-                HelpID = ITM_VER_CNTR ;
+                HelpID = HID_ITM_VER_CNTR ;
             };
             ToolBoxItem
             {
                 Identifier = ITM_VER_RGHT ;
-                HelpID = ITM_VER_RGHT ;
+                HelpID = HID_ITM_VER_RGHT ;
             };
         };
     };
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 2f698fb7817f..162a6a5cea4f 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -143,8 +143,7 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet,
     FreeResource();
 
     GetOKButton().SetText(String(SW_RES(STR_BTN_NEW_DOC)));
-    // FIXME: HELPID
-    GetOKButton().SetHelpId(""/*HID_LABEL_INSERT*/);
+    GetOKButton().SetHelpId(HID_LABEL_INSERT);
     GetOKButton().SetHelpText(aEmptyStr);   // Damit generierter Hilfetext verwendet wird
 
     AddTabPage(TP_LAB_LAB, m_bLabel ? sFormat : sMedium ,SwLabPage   ::Create, 0, sal_False, 0);
@@ -346,16 +345,11 @@ void lcl_ChgYPos(Window& rWin, long nDiff)
 
 void SwLabPage::SetToBusinessCard()
 {
-    // FIXME: HELPID
-    SetHelpId(""/*HID_BUSINESS_FMT_PAGE*/);
-    // FIXME: HELPID
-    aContButton.SetHelpId(""/*HID_BUSINESS_FMT_PAGE_CONT*/);
-    // FIXME: HELPID
-    aSheetButton.SetHelpId(""/*HID_BUSINESS_FMT_PAGE_SHEET*/);
-    // FIXME: HELPID
-    aMakeBox.SetHelpId(""/*HID_BUSINESS_FMT_PAGE_BRAND*/);
-    // FIXME: HELPID
-    aTypeBox.SetHelpId(""/*HID_BUSINESS_FMT_PAGE_TYPE*/);
+    SetHelpId(HID_BUSINESS_FMT_PAGE);
+    aContButton.SetHelpId(HID_BUSINESS_FMT_PAGE_CONT);
+    aSheetButton.SetHelpId(HID_BUSINESS_FMT_PAGE_SHEET);
+    aMakeBox.SetHelpId(HID_BUSINESS_FMT_PAGE_BRAND);
+    aTypeBox.SetHelpId(HID_BUSINESS_FMT_PAGE_TYPE);
     m_bLabel = sal_False;
     aWritingText.Hide();
     aAddrBox.Hide();
@@ -733,8 +727,7 @@ SwVisitingCardPage::SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet)
     aAutoTextLB.SetWindowBits( WB_HSCROLL );
     aAutoTextLB.SetSpaceBetweenEntries(0);
     aAutoTextLB.SetSelectionMode( SINGLE_SELECTION );
-    // FIXME: HELPID
-    aAutoTextLB.SetHelpId(""/*HID_BUSINESS_CARD_CONTENT*/);
+    aAutoTextLB.SetHelpId(HID_BUSINESS_CARD_CONTENT);
 
     SetExchangeSupport();
     aAutoTextLB.SetSelectHdl(LINK(this, SwVisitingCardPage, AutoTextSelectHdl));
diff --git a/sw/source/ui/envelp/mailmrge.src b/sw/source/ui/envelp/mailmrge.src
index ec6888e2c0e1..e73dec9e9e72 100644
--- a/sw/source/ui/envelp/mailmrge.src
+++ b/sw/source/ui/envelp/mailmrge.src
@@ -41,7 +41,7 @@ ModalDialog DLG_MAILMERGE
     _MAIL_MERGE_STRING_
     Moveable = TRUE ;
     Sizeable = TRUE;
-    HelpID = FN_QRY_MERGE ;
+    HelpID = CMD_FN_QRY_MERGE ;
     Window WIN_BEAMER
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;