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

7 files changed, 48 insertions, 58 deletions

diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index f64bde3a0da8..dc007fc68e13 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -214,12 +214,10 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) :
     m_aListHB.InsertItem( ITEMID_TABLE, m_sTable,
                             aSz.Width()/2,
                             HIB_LEFT | HIB_VCENTER | HIB_FIXED | HIB_FIXEDPOS /*| HIB_CLICKABLE | HIB_UPARROW */);
-    // FIXME: HELPID
-    m_aListHB.SetHelpId(""/*HID_MM_ADDRESSLIST_HB*/ );
+    m_aListHB.SetHelpId(HID_MM_ADDRESSLIST_HB );
     m_aListHB.Show();
 
-    // FIXME: HELPID
-    m_aListLB.SetHelpId(""/*HID_MM_ADDRESSLIST_TLB*/);
+    m_aListLB.SetHelpId(HID_MM_ADDRESSLIST_TLB);
     static long nTabs[] = {2, 0, aSz.Width()/2 };
     m_aListLB.SetWindowBits( WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
     m_aListLB.SetSelectionMode( SINGLE_SELECTION );
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index ee02eb283649..1e0a1faf1cbc 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -236,8 +236,7 @@ SwDBTreeList::SwDBTreeList(Window *pParent, const ResId& rResId,
     bShowColumns    (bShowCol),
     pImpl(new SwDBTreeList_Impl(pSh))
 {
-    // FIXME: HELPID
-    SetHelpId(""/*HID_DB_SELECTION_TLB*/);
+    SetHelpId(HID_DB_SELECTION_TLB);
 
     if (IsVisible())
         InitTreeList();
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 6b3fd3317d06..758f52840230 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -384,8 +384,7 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf
     m_nStatusHeight =  m_aSeparatorFL.GetPosPixel().Y() - m_aStatusLB.GetPosPixel().Y();
     String sTask(SW_RES(ST_TASK));
     String sStatus(SW_RES(ST_STATUS));
-    // FIXME: HELPID
-    m_aStatusLB.SetHelpId(""/*HID_MM_SENDMAILS_STATUSLB*/);
+    m_aStatusLB.SetHelpId(HID_MM_SENDMAILS_STATUSLB);
 
     FreeResource();
 
@@ -414,12 +413,10 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf
     m_aStatusHB.InsertItem( ITEMID_STATUS, sStatus,
                             nPos2,
                             HIB_LEFT | HIB_VCENTER );
-    // FIXME: HELPID
-    m_aStatusHB.SetHelpId(""/*HID_MM_ADDRESSLIST_HB*/ );
+    m_aStatusHB.SetHelpId(HID_MM_ADDRESSLIST_HB );
     m_aStatusHB.Show();
 
-    // FIXME: HELPID
-    m_aStatusLB.SetHelpId(""/*HID_MM_MAILSTATUS_TLB*/);
+    m_aStatusLB.SetHelpId(HID_MM_MAILSTATUS_TLB);
     static long nTabs[] = {3, 0, nPos1, aSz.Width() };
     m_aStatusLB.SetWindowBits( WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
     m_aStatusLB.SetSelectionMode( SINGLE_SELECTION );
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index e37ff3184717..54cf6edac512 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -89,10 +89,8 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rItem
     enableButtons(WZB_FINISH, sal_False);
 
     m_pFinish->SetText(m_sFinish);
-    // FIXME: HELPID
-    m_pNextPage->SetHelpId(""/*HID_MM_NEXT_PAGE*/);
-    // FIXME: HELPID
-    m_pPrevPage->SetHelpId(""/*HID_MM_PREV_PAGE*/);
+    m_pNextPage->SetHelpId(HID_MM_NEXT_PAGE);
+    m_pPrevPage->SetHelpId(HID_MM_PREV_PAGE);
 
     //#i51949# no output type page visible if e-Mail is not supported
     if(rItem.IsMailAvailable())
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index f507243b0605..bd4f0ec3ebde 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1070,8 +1070,7 @@ SwAssignFieldsControl::SwAssignFieldsControl(
     m_nFirstYPos(0)
 {
     SetStyle(GetStyle()|WB_TABSTOP|WB_DIALOGCONTROL);
-    // FIXME: HELPID
-    SetHelpId(""/*HID_MM_ASSIGN_FIELDS*/);
+    SetHelpId(HID_MM_ASSIGN_FIELDS);
     long nHBHeight = m_aHeaderHB.CalcWindowSizePixel().Height();
     Size aOutputSize(GetOutputSize());
     m_aHeaderHB.SetSizePixel(
@@ -1098,6 +1097,25 @@ SwAssignFieldsControl::SwAssignFieldsControl(
     uno::Sequence< ::rtl::OUString> aAssignments = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() );
     Link aMatchHdl = LINK(this, SwAssignFieldsControl, MatchHdl_Impl);
     Link aFocusHdl = LINK(this, SwAssignFieldsControl, GotFocusHdl_Impl);
+
+    static const char* aHIDs[] =
+    {
+         HID_MM_HEADER_0,
+         HID_MM_HEADER_1,
+         HID_MM_HEADER_2,
+         HID_MM_HEADER_3,
+         HID_MM_HEADER_4,
+         HID_MM_HEADER_5,
+         HID_MM_HEADER_6,
+         HID_MM_HEADER_7,
+         HID_MM_HEADER_8,
+         HID_MM_HEADER_9,
+         HID_MM_HEADER_10,
+         HID_MM_HEADER_11,
+         HID_MM_HEADER_12,
+         HID_MM_HEADER_13
+    };
+
     //fill the controls
     for(USHORT i = 0; i < rHeaders.Count(); ++i)
     {
@@ -1107,8 +1125,7 @@ SwAssignFieldsControl::SwAssignFieldsControl(
         sLabel.Insert(rHeader, 1);
         pNewText->SetText(sLabel);
         ListBox* pNewLB = new ListBox(&m_aWindow, ResId(LB_FIELDS, *rResId.GetResMgr()));
-        // FIXME: HELPID
-        pNewLB->SetHelpId( ""/*HID_MM_HEADER_0 + i*/ );
+        pNewLB->SetHelpId( aHIDs[i] );
         pNewLB->SelectEntryPos(0);
         for(sal_Int32 nField = 0; nField < aFields.getLength(); ++nField)
             pNewLB->InsertEntry(pFields[nField]);
@@ -1442,8 +1459,7 @@ DDListBox::DDListBox(SwCustomizeAddressBlockDialog* pParent, const ResId rResId)
     SetSelectionMode( SINGLE_SELECTION );
     SetDragDropMode(   SV_DRAGDROP_CTRL_COPY );
     EnableAsyncDrag(TRUE);
-    // FIXME: HELPID
-    SetHelpId(""/*HID_MM_CUSTOMFIELDS*/);
+    SetHelpId(HID_MM_CUSTOMFIELDS);
     // expand selection to the complete width of the ListBox
     SetHighlightRange();
     Show();
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 9bd44837ed45..c7613055d6ab 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -308,22 +308,14 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent)
     m_pNeutralCB    = &m_aNeutralCB;
     m_bIsTabPage = true;
 
-    // FIXME: HELPID
-    m_pPersonalizedCB->SetHelpId(   ""/*HID_MM_GREETINGS_CB_PERSONALIZED*/);
-    // FIXME: HELPID
-    m_pFemaleLB->SetHelpId(         ""/*HID_MM_GREETINGS_LB_FEMALE*/      );
-    // FIXME: HELPID
-    m_pFemalePB->SetHelpId(         ""/*HID_MM_GREETINGS_PB_FEMALE*/      );
-    // FIXME: HELPID
-    m_pMaleLB->SetHelpId(           ""/*HID_MM_GREETINGS_LB_MALE*/        );
-    // FIXME: HELPID
-    m_pMalePB->SetHelpId(           ""/*HID_MM_GREETINGS_PB_MALE*/        );
-    // FIXME: HELPID
-    m_pFemaleColumnLB->SetHelpId(   ""/*HID_MM_GREETINGS_LB_FEMALECOLUMN*/);
-    // FIXME: HELPID
-    m_pFemaleFieldCB->SetHelpId(    ""/*HID_MM_GREETINGS_CB_FEMALEFIELD*/ );
-    // FIXME: HELPID
-    m_pNeutralCB->SetHelpId(        ""/*HID_MM_GREETINGS_CB_NEUTRAL*/     );
+    m_pPersonalizedCB->SetHelpId(   HID_MM_GREETINGS_CB_PERSONALIZED);
+    m_pFemaleLB->SetHelpId(         HID_MM_GREETINGS_LB_FEMALE      );
+    m_pFemalePB->SetHelpId(         HID_MM_GREETINGS_PB_FEMALE      );
+    m_pMaleLB->SetHelpId(           HID_MM_GREETINGS_LB_MALE        );
+    m_pMalePB->SetHelpId(           HID_MM_GREETINGS_PB_MALE        );
+    m_pFemaleColumnLB->SetHelpId(   HID_MM_GREETINGS_LB_FEMALECOLUMN);
+    m_pFemaleFieldCB->SetHelpId(    HID_MM_GREETINGS_CB_FEMALEFIELD );
+    m_pNeutralCB->SetHelpId(        HID_MM_GREETINGS_CB_NEUTRAL     );
 
     FreeResource();
     m_aGreetingLineCB.SetClickHdl(LINK(this, SwMailMergeGreetingsPage, ContainsHdl_Impl));
@@ -532,22 +524,14 @@ SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard* _pWizard)
     m_pNeutralCB    = &m_aNeutralCB;
     m_bIsTabPage = false;
 
-    // FIXME: HELPID
-    m_pPersonalizedCB->SetHelpId(   ""/*HID_MM_BODY_CB_PERSONALIZED*/     );
-    // FIXME: HELPID
-    m_pFemaleLB->SetHelpId(         ""/*HID_MM_BODY_LB_FEMALE*/           );
-    // FIXME: HELPID
-    m_pFemalePB->SetHelpId(         ""/*HID_MM_BODY_PB_FEMALE*/           );
-    // FIXME: HELPID
-    m_pMaleLB->SetHelpId(           ""/*HID_MM_BODY_LB_MALE*/             );
-    // FIXME: HELPID
-    m_pMalePB->SetHelpId(           ""/*HID_MM_BODY_PB_MALE*/             );
-    // FIXME: HELPID
-    m_pFemaleColumnLB->SetHelpId(   ""/*HID_MM_BODY_LB_FEMALECOLUMN*/     );
-    // FIXME: HELPID
-    m_pFemaleFieldCB->SetHelpId(    ""/*HID_MM_BODY_CB_FEMALEFIELD*/      );
-    // FIXME: HELPID
-    m_pNeutralCB->SetHelpId(        ""/*HID_MM_BODY_CB_NEUTRAL*/          );
+    m_pPersonalizedCB->SetHelpId(   HID_MM_BODY_CB_PERSONALIZED     );
+    m_pFemaleLB->SetHelpId(         HID_MM_BODY_LB_FEMALE           );
+    m_pFemalePB->SetHelpId(         HID_MM_BODY_PB_FEMALE           );
+    m_pMaleLB->SetHelpId(           HID_MM_BODY_LB_MALE             );
+    m_pMalePB->SetHelpId(           HID_MM_BODY_PB_MALE             );
+    m_pFemaleColumnLB->SetHelpId(   HID_MM_BODY_LB_FEMALECOLUMN     );
+    m_pFemaleFieldCB->SetHelpId(    HID_MM_BODY_CB_FEMALEFIELD      );
+    m_pNeutralCB->SetHelpId(        HID_MM_BODY_CB_NEUTRAL          );
 
     FreeResource();
     m_aGreetingLineCB.SetClickHdl(LINK(this, SwMailBodyDialog, ContainsHdl_Impl));
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index eb02d713beb7..6cb7b87336c8 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -103,14 +103,12 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent,
     m_aTableHB.InsertItem( 2, m_sType,
                             aSz.Width()/2,
                             HIB_LEFT | HIB_VCENTER /*| HIB_CLICKABLE | HIB_UPARROW */);
-    // FIXME: HELPID
-    m_aTableHB.SetHelpId(""/*HID_MM_ADDRESSLIST_HB*/ );
+    m_aTableHB.SetHelpId(HID_MM_ADDRESSLIST_HB );
     m_aTableHB.Show();
 
     static long nTabs[] = {3, 0, aSz.Width()/2, aSz.Width() };
     m_aTableLB.SetTabs(&nTabs[0], MAP_PIXEL);
-    // FIXME: HELPID
-    m_aTableLB.SetHelpId(""/*HID_MM_SELECTDBTABLEDDIALOG_LISTBOX*/);
+    m_aTableLB.SetHelpId(HID_MM_SELECTDBTABLEDDIALOG_LISTBOX);
     m_aTableLB.SetWindowBits( WB_CLIPCHILDREN );
     m_aTableLB.SetSpaceBetweenEntries(3);
     m_aTableLB.SetSelectionMode( SINGLE_SELECTION );