Kaydet (Commit) 6ad13d35 authored tarafından Caolán McNamara's avatar Caolán McNamara

drop helpids that go nowhere

Change-Id: Ie487d86b95f49812cd2f4620d6d652b7422e6139
üst 2489589a
...@@ -367,7 +367,6 @@ ...@@ -367,7 +367,6 @@
#define HID_MM_SELECTDBTABLEDDIALOG "SW_HID_MM_SELECTDBTABLEDDIALOG" #define HID_MM_SELECTDBTABLEDDIALOG "SW_HID_MM_SELECTDBTABLEDDIALOG"
#define HID_MM_SELECTDBTABLEDDIALOG_LISTBOX "SW_HID_MM_SELECTDBTABLEDDIALOG_LISTBOX" #define HID_MM_SELECTDBTABLEDDIALOG_LISTBOX "SW_HID_MM_SELECTDBTABLEDDIALOG_LISTBOX"
#define HID_MM_DBTABLEPREVIEWDIALOG "SW_HID_MM_DBTABLEPREVIEWDIALOG" #define HID_MM_DBTABLEPREVIEWDIALOG "SW_HID_MM_DBTABLEPREVIEWDIALOG"
#define HID_MM_ASSIGNFIELDS "SW_HID_MM_ASSIGNFIELDS"
#define HID_MM_ADDRESSLIST_HB "SW_HID_MM_ADDRESSLIST_HB" #define HID_MM_ADDRESSLIST_HB "SW_HID_MM_ADDRESSLIST_HB"
#define HID_MM_MAILBODY "SW_HID_MM_MAILBODY" #define HID_MM_MAILBODY "SW_HID_MM_MAILBODY"
#define HID_MM_SENDMAILS "SW_HID_MM_SENDMAILS" #define HID_MM_SENDMAILS "SW_HID_MM_SENDMAILS"
...@@ -406,21 +405,6 @@ ...@@ -406,21 +405,6 @@
#define HID_MM_BODY_LB_FEMALECOLUMN "SW_HID_MM_BODY_LB_FEMALECOLUMN" #define HID_MM_BODY_LB_FEMALECOLUMN "SW_HID_MM_BODY_LB_FEMALECOLUMN"
#define HID_MM_BODY_CB_FEMALEFIELD "SW_HID_MM_BODY_CB_FEMALEFIELD" #define HID_MM_BODY_CB_FEMALEFIELD "SW_HID_MM_BODY_CB_FEMALEFIELD"
#define HID_MM_BODY_CB_NEUTRAL "SW_HID_MM_BODY_CB_NEUTRAL" #define HID_MM_BODY_CB_NEUTRAL "SW_HID_MM_BODY_CB_NEUTRAL"
#define HID_MM_ASSIGN_FIELDS "SW_HID_MM_ASSIGN_FIELDS"
#define HID_MM_HEADER_0 "SW_HID_MM_HEADER_0"
#define HID_MM_HEADER_1 "SW_HID_MM_HEADER_1"
#define HID_MM_HEADER_2 "SW_HID_MM_HEADER_2"
#define HID_MM_HEADER_3 "SW_HID_MM_HEADER_3"
#define HID_MM_HEADER_4 "SW_HID_MM_HEADER_4"
#define HID_MM_HEADER_5 "SW_HID_MM_HEADER_5"
#define HID_MM_HEADER_6 "SW_HID_MM_HEADER_6"
#define HID_MM_HEADER_7 "SW_HID_MM_HEADER_7"
#define HID_MM_HEADER_8 "SW_HID_MM_HEADER_8"
#define HID_MM_HEADER_9 "SW_HID_MM_HEADER_9"
#define HID_MM_HEADER_10 "SW_HID_MM_HEADER_10"
#define HID_MM_HEADER_11 "SW_HID_MM_HEADER_11"
#define HID_MM_HEADER_12 "SW_HID_MM_HEADER_12"
#define HID_MM_HEADER_13 "SW_HID_MM_HEADER_13"
#define HID_TBX_FORMULA_CALC "SW_HID_TBX_FORMULA_CALC" #define HID_TBX_FORMULA_CALC "SW_HID_TBX_FORMULA_CALC"
#define HID_TBX_FORMULA_CANCEL "SW_HID_TBX_FORMULA_CANCEL" #define HID_TBX_FORMULA_CANCEL "SW_HID_TBX_FORMULA_CANCEL"
......
...@@ -845,7 +845,6 @@ SwAssignFieldsControl::SwAssignFieldsControl(Window* pParent, WinBits nBits) : ...@@ -845,7 +845,6 @@ SwAssignFieldsControl::SwAssignFieldsControl(Window* pParent, WinBits nBits) :
m_nYOffset(0), m_nYOffset(0),
m_nFirstYPos(0) m_nFirstYPos(0)
{ {
SetHelpId(HID_MM_ASSIGN_FIELDS);
long nHBHeight = m_aHeaderHB.CalcWindowSizePixel().Height(); long nHBHeight = m_aHeaderHB.CalcWindowSizePixel().Height();
Size aOutputSize(GetOutputSize()); Size aOutputSize(GetOutputSize());
m_aVScroll.Show(); m_aVScroll.Show();
...@@ -886,24 +885,6 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem) ...@@ -886,24 +885,6 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem)
Link aMatchHdl = LINK(this, SwAssignFieldsControl, MatchHdl_Impl); Link aMatchHdl = LINK(this, SwAssignFieldsControl, MatchHdl_Impl);
Link aFocusHdl = LINK(this, SwAssignFieldsControl, GotFocusHdl_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 //fill the controls
long nControlWidth = aOutputSize.Width() / 3; long nControlWidth = aOutputSize.Width() / 3;
long nControlHeight = -1; long nControlHeight = -1;
...@@ -915,7 +896,6 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem) ...@@ -915,7 +896,6 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem)
ListBox* pNewLB = new ListBox(&m_aWindow, WB_DROPDOWN | WB_VCENTER | WB_TABSTOP); ListBox* pNewLB = new ListBox(&m_aWindow, WB_DROPDOWN | WB_VCENTER | WB_TABSTOP);
pNewText->set_mnemonic_widget(pNewLB); pNewText->set_mnemonic_widget(pNewLB);
pNewLB->InsertEntry(SW_RESSTR(SW_STR_NONE)); pNewLB->InsertEntry(SW_RESSTR(SW_STR_NONE));
pNewLB->SetHelpId( aHIDs[i] );
pNewLB->SelectEntryPos(0); pNewLB->SelectEntryPos(0);
pNewLB->SetDropDownLineCount(5); pNewLB->SetDropDownLineCount(5);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment