From 27f199af29794fffb97eb73357c7f9dd4dae0201 Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" <Philipp.Lohmann@Sun.COM>
Date: Fri, 4 Jun 2010 13:46:22 +0200
Subject: changehid: #i111874# remove SmartId, make HID of type rtl::OString,
 fill in dummies for all explicit help ids

---
 sw/source/ui/dbui/mmaddressblockpage.cxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'sw/source/ui/dbui/mmaddressblockpage.cxx')

diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index b2d8c790c25d..f507243b0605 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1070,7 +1070,8 @@ SwAssignFieldsControl::SwAssignFieldsControl(
     m_nFirstYPos(0)
 {
     SetStyle(GetStyle()|WB_TABSTOP|WB_DIALOGCONTROL);
-    SetHelpId(HID_MM_ASSIGN_FIELDS);
+    // FIXME: HELPID
+    SetHelpId(""/*HID_MM_ASSIGN_FIELDS*/);
     long nHBHeight = m_aHeaderHB.CalcWindowSizePixel().Height();
     Size aOutputSize(GetOutputSize());
     m_aHeaderHB.SetSizePixel(
@@ -1106,7 +1107,8 @@ SwAssignFieldsControl::SwAssignFieldsControl(
         sLabel.Insert(rHeader, 1);
         pNewText->SetText(sLabel);
         ListBox* pNewLB = new ListBox(&m_aWindow, ResId(LB_FIELDS, *rResId.GetResMgr()));
-        pNewLB->SetHelpId( HID_MM_HEADER_0 + i );
+        // FIXME: HELPID
+        pNewLB->SetHelpId( ""/*HID_MM_HEADER_0 + i*/ );
         pNewLB->SelectEntryPos(0);
         for(sal_Int32 nField = 0; nField < aFields.getLength(); ++nField)
             pNewLB->InsertEntry(pFields[nField]);
@@ -1440,7 +1442,8 @@ DDListBox::DDListBox(SwCustomizeAddressBlockDialog* pParent, const ResId rResId)
     SetSelectionMode( SINGLE_SELECTION );
     SetDragDropMode(   SV_DRAGDROP_CTRL_COPY );
     EnableAsyncDrag(TRUE);
-    SetHelpId(HID_MM_CUSTOMFIELDS);
+    // FIXME: HELPID
+    SetHelpId(""/*HID_MM_CUSTOMFIELDS*/);
     // expand selection to the complete width of the ListBox
     SetHighlightRange();
     Show();
-- 
cgit 


From c80988b0107424ba6de85531ed55fd493a0a64cb 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

---
 sw/source/ui/dbui/mmaddressblockpage.cxx | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'sw/source/ui/dbui/mmaddressblockpage.cxx')

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();
-- 
cgit