INTEGRATION: CWS hc680dec (1.7.20); FILE MERGED

2006/01/17 13:21:06 ufi 1.7.20.1: 17Jan06

1 files changed, 40 insertions, 36 deletions

diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index 544ecd2ce6..5d83e2e2c2 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -1892,6 +1892,7 @@ HID_FUNC_ARSINHYP,58237,
 HID_FUNC_ARTANHYP,58241,
 HID_FUNC_AUFRUNDEN,58264,
 HID_FUNC_B,58424,
+HID_FUNC_BAHTTEXT,58606,
 HID_FUNC_BASIS,58602,
 HID_FUNC_BEREICHE,58490,
 HID_FUNC_BESTIMMTHEITSMASS,58461,
@@ -2479,7 +2480,6 @@ HID_MACRO_GROUP,33155,
 HID_MACRO_HEADERTABLISTBOX,33380,
 HID_MACRO_LB_EVENT,33132,
 HID_MACRO_MACROS,33156,
-HID_MAILMERGECHILD,54985,
 HID_MAIL_MERGE_CREATE_FROM,54947,
 HID_MAIL_MERGE_INSERT_FIELDS,54948,
 HID_MANAGE_STYLES,33074,
@@ -5203,6 +5203,7 @@ SID_INSERT_HSCROLLBAR,10194,.uno:HScrollbar
 SID_INSERT_IMAGE,27105,.uno:InsertImage
 SID_INSERT_IMAGECONTROL,10926,.uno:InsertImageControl
 SID_INSERT_LISTBOX,10191,.uno:InsertListbox
+SID_INSERT_LRM,11057,
 SID_INSERT_MASTER_PAGE,27431,.uno:InsertMasterPage
 SID_INSERT_MATH,27106,.uno:InsertMath
 SID_INSERT_MATRIX,26477,.uno:InsertMatrix
@@ -5216,6 +5217,7 @@ SID_INSERT_PREVIEW,10196,.uno:Preview
 SID_INSERT_PROGRESSBAR,10927,.uno:ProgressBar
 SID_INSERT_PUSHBUTTON,10146,.uno:InsertPushbutton
 SID_INSERT_RADIOBUTTON,10147,.uno:Radiobutton
+SID_INSERT_RLM,11056,
 SID_INSERT_SELECT,10198,.uno:SelectMode
 SID_INSERT_SIMAGE,26061,.uno:InsertObjectStarImage
 SID_INSERT_SMATH,26063,.uno:InsertObjectStarMath
@@ -5228,6 +5230,8 @@ SID_INSERT_URLBUTTON,10197,.uno:URLButton
 SID_INSERT_VFIXEDLINE,10929,.uno:VFixedLine
 SID_INSERT_VIDEO,5677,.uno:InsertVideo
 SID_INSERT_VSCROLLBAR,10195,.uno:VScrollbar
+SID_INSERT_ZWNBSP,11059,
+SID_INSERT_ZWSP,11058,
 SID_INS_FUNCTION,26270,.uno:InsertFunction
 SID_INTERACTIVEMODE,5344,.uno:Interactive
 SID_INTERNET_ONLINE,6370,.uno:InternetOnline
@@ -5508,6 +5512,7 @@ SID_RENAME_OBJECT,26088,.uno:RenameObject
 SID_REPAINT,26012,.uno:Repaint
 SID_REPEAT,5702,.uno:Repeat
 SID_REPORT_CREATE_REPWIZ_PRE_SEL,12302,
+SID_RESTORE_EDITING_VIEW,6663,
 SID_REVERSE_ORDER,27117,.uno:ReverseOrder
 SID_RIGHT_PANE,27416,
 SID_ROW_MOREBACK,30595,
@@ -5772,7 +5777,7 @@ SID_ZOOM_OUT,10097,.uno:ZoomPlus
 SID_ZOOM_PANNING,27017,.uno:ZoomPanning
 SID_ZOOM_PREV,10403,.uno:ZoomPrevious
 SID_ZOOM_TOOLBOX,10096,.uno:ZoomToolBox
-SRC680.m130,010101010101010,
+SRC680.m148,010101010101010,
 SW_BEZIERSHELL,266,
 SW_DRAWFORMSHELL,268,
 SW_DRAWSHELL,258,
@@ -6165,21 +6170,7 @@ dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_DEF,851640834,
 dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_DEFDATA,851640833,
 dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_VIEW,851640835,
 dbaccess_TabPage_PAGE_CONNECTION,851542016,
-dbaccess_TabPage_PAGE_DBWIZARD_ADABAS,852180992,
-dbaccess_TabPage_PAGE_DBWIZARD_ADO,852262912,
-dbaccess_TabPage_PAGE_DBWIZARD_AUTHENTIFICATION,852312064,
-dbaccess_TabPage_PAGE_DBWIZARD_DBASE,852115456,
-dbaccess_TabPage_PAGE_DBWIZARD_FINAL,852344832,
-dbaccess_TabPage_PAGE_DBWIZARD_JDBC,852246528,
-dbaccess_TabPage_PAGE_DBWIZARD_LDAP,852164608,
-dbaccess_TabPage_PAGE_DBWIZARD_MSACCESS,852148224,
 dbaccess_TabPage_PAGE_DBWIZARD_MYSQL_INTRO,852197376,
-dbaccess_TabPage_PAGE_DBWIZARD_MYSQL_JDBC,852328448,
-dbaccess_TabPage_PAGE_DBWIZARD_ODBC,852279296,
-dbaccess_TabPage_PAGE_DBWIZARD_ORACLE,852230144,
-dbaccess_TabPage_PAGE_DBWIZARD_SPREADSHEET,852295680,
-dbaccess_TabPage_PAGE_DBWIZARD_TEXT,852131840,
-dbaccess_TabPage_PAGE_DBWIZARD_USERDEFINED,852361216,
 dbaccess_TabPage_PAGE_DS_PROPERTIES_1,851820544,
 dbaccess_TabPage_PAGE_DS_PROPERTIES_2,851836928,
 dbaccess_TabPage_PAGE_DS_PROPERTIES_3,851918848,
@@ -6332,12 +6323,14 @@ extensions_PushButton_RID_SANE_DIALOG_RID_SCAN_BUTTON_OPTION_BTN,1090130460,
 extensions_PushButton_RID_TP_LICENSE_PB_PAGEDOWN,553669138,
 extensions_RadioButton_MD_PROTCHK_DIALOG_RB_OTHER,1330987535,
 extensions_RadioButton_MD_PROTCHK_DIALOG_RB_STAROFFICE,1330987534,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION,860619266,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_LDAP,860619267,
+extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION,860619267,
+extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_KAB,860619268,
+extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_LDAP,860619269,
 extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_MORK,860619265,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OTHER,860619270,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OUTLOOK,860619268,
-extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OUTLOOKEXPRESS,860619269,
+extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OTHER,860619272,
+extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OUTLOOK,860619270,
+extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OUTLOOKEXPRESS,860619271,
+extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_THUNDERBIRD,860619266,
 extensions_TabPage_RID_PAGE_ADMININVOKATION,860635136,
 extensions_TabPage_RID_PAGE_FIELDMAPPING,860667904,
 extensions_TabPage_RID_PAGE_FINAL,860684288,
@@ -6352,6 +6345,7 @@ filter_CheckBox_DLG_OPTIONS_BOOL_EXPORT_MULTIPLE_FILES,1090520071,
 filter_CheckBox_DLG_OPTIONS_BOOL_EXPORT_OLE_AS_JPEG,1090520070,
 filter_CheckBox_DLG_OPTIONS_BOOL_EXPORT_SLIDE_CONTENTS,1090520068,
 filter_CheckBox_DLG_OPTIONS_BOOL_EXPORT_SOUND,1090520069,
+filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTEMPTYPAGES,1404699670,
 filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTNOTES,1404699666,
 filter_CheckBox_RID_PDF_EXPORT_DLG_CB_REDUCEIMAGERESOLUTION,1404699662,
 filter_CheckBox_RID_PDF_EXPORT_DLG_CB_TAGGEDPDF,1404699665,
@@ -7228,8 +7222,9 @@ sd_ComboBox_RID_TP_CUSTOMANIMATION_DURATION_CB_DURATION,878841862,
 sd_ComboBox_RID_TP_CUSTOMANIMATION_DURATION_CB_REPEAT,878841864,
 sd_ComboBox_RID_TP_CUSTOMANIMATION_ENTRANCE_CB_SPEED,878874627,
 sd_ComboBox_TP_OPTIONS_MISC_CB_SCALE,546689053,
-sd_DockingWindow_FLT_LEFT_PANE_DOCKING_WINDOW,3234201600,
-sd_DockingWindow_FLT_RIGHT_PANE_DOCKING_WINDOW,3234217984,
+sd_DockingWindow_FLT_LEFT_PANE_DRAW_DOCKING_WINDOW,3234217984,
+sd_DockingWindow_FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW,3234201600,
+sd_DockingWindow_FLT_RIGHT_PANE_DOCKING_WINDOW,3234234368,
 sd_Edit_DLG_ASS_EDT_PAGE4_ASKNAME,1088489495,
 sd_Edit_DLG_ASS_EDT_PAGE4_ASKTOPIC,1088489497,
 sd_Edit_DLG_DEFINE_CUSTOMSHOW_EDT_NAME,1088325633,
@@ -7787,9 +7782,9 @@ svx_CheckBox_OFA_TP_LANGUAGES_CB_CTLSUPPORT,810566671,
 svx_CheckBox_OFA_TP_LANGUAGES_CB_CURRENT_DOC,810566667,
 svx_CheckBox_OFA_TP_LANGUAGES_CB_DECIMALSEPARATOR,810566684,
 svx_CheckBox_OFA_TP_MEMORY_CB_QUICKLAUNCH,811303963,
-svx_CheckBox_OFA_TP_MISC_CB_DOCSTATUS,810484796,
+svx_CheckBox_OFA_TP_MISC_CB_DOCSTATUS,810484797,
 svx_CheckBox_OFA_TP_MISC_CB_EXTHELP,810484748,
-svx_CheckBox_OFA_TP_MISC_CB_FILEDLG,810484790,
+svx_CheckBox_OFA_TP_MISC_CB_FILEDLG,810484791,
 svx_CheckBox_OFA_TP_MISC_CB_HELPAGENT,810484749,
 svx_CheckBox_OFA_TP_MISC_CB_TOOLTIP,810484747,
 svx_CheckBox_OFA_TP_VIEW_BTN_DOCVIEW,810517555,
@@ -7950,6 +7945,7 @@ svx_CheckBox_RID_SVXPAGE_NUM_OPTIONS_CB_SAME_LEVEL,704300220,
 svx_CheckBox_RID_SVXPAGE_NUM_POSITION_CB_RELATIVE,704316601,
 svx_CheckBox_RID_SVXPAGE_OPTIONS_CTL_CB_RESTRICTED,704840716,
 svx_CheckBox_RID_SVXPAGE_OPTIONS_CTL_CB_SEQUENCECHECKING,704840715,
+svx_CheckBox_RID_SVXPAGE_OPTIONS_CTL_CB_TYPE_REPLACE,704840717,
 svx_CheckBox_RID_SVXPAGE_OPTIONS_JAVA_CB_JAVA_ENABLE,704857099,
 svx_CheckBox_RID_SVXPAGE_PAGE_CB_ADAPT,701121608,
 svx_CheckBox_RID_SVXPAGE_PAGE_CB_HORZ,701121606,
@@ -8562,6 +8558,7 @@ svx_MultiLineEdit_RID_SVXDLG_ADD_CONDITION_ED_CONDITION,1368869387,
 svx_MultiLineEdit_RID_SVXDLG_POSTIT_ED_EDIT,1237715469,
 svx_MultiLineEdit_RID_SVXDLG_SPELLCHECK_ED_NEWWORD,2311850530,
 svx_MultiLineEdit_RID_SVXPAGE_ERR_REP_SEND_ML_ERRSEND_USING,700893719,
+svx_MultiLineEdit_RID_SVXPAGE_MENUS_ED_DESCRIPTION,705497925,
 svx_MultiLineEdit_RID_SVX_MDLG_ERR_REP_PREVIEW_ML_ERRPREVIEW_CONTENT,1237813761,
 svx_MultiListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_LB_ENTRIES,809159812,
 svx_MultiListBox_RID_SVXPAGE_NUM_OPTIONS_LB_LEVEL,704302232,
@@ -8975,8 +8972,9 @@ sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_SW,1446609940,
 sw_CheckBox_DLG_MAILMERGE_CB_SINGLE_JOBS,1446609938,
 sw_CheckBox_DLG_MM_ADDRESSBLOCK_PAGE_CB_ADDRESS,898237446,
 sw_CheckBox_DLG_MM_FIND_ENTRY_CB_FINDONLY,2508997635,
-sw_CheckBox_DLG_MM_GREETINGS_PAGE_CB_GREETINGLINE_DLG_MM_MAILBODY_CB_GREETINGLINE,898532367,
+sw_CheckBox_DLG_MM_GREETINGS_PAGE_CB_GREETINGLINE,898253839,
 sw_CheckBox_DLG_MM_LAYOUT_PAGE_CB_ALIGN,898499596,
+sw_CheckBox_DLG_MM_MAILBODY_CB_GREETINGLINE,1435403279,
 sw_CheckBox_DLG_MM_MERGE_PAGE_CB_BACKWARDS,898286601,
 sw_CheckBox_DLG_MM_MERGE_PAGE_CB_MATCHCASE,898286602,
 sw_CheckBox_DLG_MM_MERGE_PAGE_CB_WHOLEWORDS,898286600,
@@ -9061,6 +9059,7 @@ sw_CheckBox_TP_OPTPRINT_PAGE_CB_LEFTP,878085184,
 sw_CheckBox_TP_OPTPRINT_PAGE_CB_PAPERFROMSETUP,878085190,
 sw_CheckBox_TP_OPTPRINT_PAGE_CB_PDRAW,878085183,
 sw_CheckBox_TP_OPTPRINT_PAGE_CB_PGRF,878085181,
+sw_CheckBox_TP_OPTPRINT_PAGE_CB_PRINTEMPTYPAGES,878085212,
 sw_CheckBox_TP_OPTPRINT_PAGE_CB_PROSPECT,878085187,
 sw_CheckBox_TP_OPTPRINT_PAGE_CB_PTAB,878085182,
 sw_CheckBox_TP_OPTPRINT_PAGE_CB_REVERSE,878085186,
@@ -9263,9 +9262,9 @@ sw_Edit_TP_SECTION_FTNENDNOTES_ED_END_SUFFIX,879249423,
 sw_Edit_TP_SECTION_FTNENDNOTES_ED_FTN_PREFIX,879249425,
 sw_Edit_TP_SECTION_FTNENDNOTES_ED_FTN_SUFFIX,879249426,
 sw_Edit_TP_TOX_SELECT_ED_TITLE,879134735,
-sw_FI_PREVIEW_DLG_MM_GREETINGS_PAGE_CB_GREETINGLINE,537116672,
+sw_FI_PREVIEW_DLG_MM_GREETINGS_PAGE,898252800,
 sw_FL_CREATEFROM_DLG_MERGE_CREATE,1447493632,
-sw_FT_BODY_DLG_MM_GREETINGS_PAGE_CB_GREETINGLINE_DLG_MM_MAILBODY,898531328,
+sw_FT_BODY_DLG_MM_MAILBODY,1435402240,
 sw_ImageButton_DLG_ADD_IDX_STYLES_PB_LEFT,1416081006,
 sw_ImageButton_DLG_ADD_IDX_STYLES_PB_RIGHT,1416081007,
 sw_ImageButton_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ALL_FROM,1435053592,
@@ -9287,8 +9286,8 @@ sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_RIGHT,1435315764,
 sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_UP,1435315762,
 sw_ImageButton_DLG_MM_CUSTOMIZE_ADDRESS_LIST_PB_DOWN,1435299335,
 sw_ImageButton_DLG_MM_CUSTOMIZE_ADDRESS_LIST_PB_UP,1435299334,
-sw_ImageButton_DLG_MM_GREETINGS_PAGE_CB_GREETINGLINE_IB_NEXTSET,537128469,
-sw_ImageButton_DLG_MM_GREETINGS_PAGE_CB_GREETINGLINE_IB_PREVSET,537128468,
+sw_ImageButton_DLG_MM_GREETINGS_PAGE_IB_NEXTSET,898264597,
+sw_ImageButton_DLG_MM_GREETINGS_PAGE_IB_PREVSET,898264596,
 sw_ImageButton_TP_COLUMN_BTN_DOWN,877882911,
 sw_ImageButton_TP_COLUMN_BTN_UP,877882910,
 sw_ImageButton_TP_ENV_ENV_BTN_INSERT,909651463,
@@ -9462,6 +9461,11 @@ sw_MenuButton_TP_ENV_FMT_BTN_ADDR_EDIT,909668370,
 sw_MenuButton_TP_ENV_FMT_BTN_SEND_EDIT,909668380,
 sw_MenuButton_TP_TOX_SELECT_MB_AUTOMARK,879144989,
 sw_Menu_TP_TOX_SELECT_MB_AUTOMARK,537346048,
+sw_MetricBox_TP_STD_FONT_LB_INDEX_SIZE,878438000,
+sw_MetricBox_TP_STD_FONT_LB_LABEL_SIZE,878437999,
+sw_MetricBox_TP_STD_FONT_LB_LIST_SIZE,878437998,
+sw_MetricBox_TP_STD_FONT_LB_STANDARD_SIZE,878437996,
+sw_MetricBox_TP_STD_FONT_LB_TITLE_SIZE,878437997,
 sw_MetricField_DLG_COL_WIDTH_ED_WIDTH,1425283588,
 sw_MetricField_DLG_MM_LAYOUT_PAGE_MF_LEFT,898505220,
 sw_MetricField_DLG_MM_LAYOUT_PAGE_MF_TOP,898505222,
@@ -9541,9 +9545,9 @@ sw_MoreButton_DLG_AUTOFMT_TABLE_BTN_MORE,1425338984,
 sw_MultiLineEdit_DLG_AP_INSERT_DB_SEL_ED_DB_TEXT,1435044369,
 sw_MultiLineEdit_DLG_FLD_INPUT_ED_EDIT,1419528707,
 sw_MultiLineEdit_DLG_JAVAEDIT_ED_EDIT,1419610637,
+sw_MultiLineEdit_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDWARNING_ED_DETAILS,1972357645,
 sw_MultiLineEdit_DLG_MM_CUSTOMIZEADDRESSBLOCK_ED_DRAG,1435306545,
-sw_MultiLineEdit_DLG_MM_GREETINGS_PAGE_CB_GREETINGLINE_DLG_MM_MAILBODY_MLE_BODY,898533919,
-sw_MultiLineEdit_DLG_MM_SENDWARNING_ED_DETAILS,1435486733,
+sw_MultiLineEdit_DLG_MM_MAILBODY_MLE_BODY,1435404831,
 sw_MultiLineEdit_DLG_MM_TESTACCOUNTSETTINGS_ED_ERROR,1427130914,
 sw_MultiLineEdit_TP_ENV_ENV_EDT_ADDR,909642242,
 sw_MultiLineEdit_TP_ENV_ENV_EDT_SEND,909642251,
@@ -9622,6 +9626,9 @@ sw_PushButton_DLG_INSERT_CHART_BT_PREV,2499121673,
 sw_PushButton_DLG_INSERT_TABLE_BT_AUTOFORMAT,1425183255,
 sw_PushButton_DLG_INS_FOOTNOTE_BT_NUMBER_CHAR,1428656644,
 sw_PushButton_DLG_JAVAEDIT_PB_URL,1419612693,
+sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_CLOSE,1972294214,
+sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_DETAILS,1972294210,
+sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_STOP,1972294213,
 sw_PushButton_DLG_MAILMERGE_PB_ATTACH,1446613538,
 sw_PushButton_DLG_MAILMERGE_PB_PATH,1446613530,
 sw_PushButton_DLG_MM_ADDRESSBLOCK_PAGE_PB_ADDRESSLIST,898241026,
@@ -9646,7 +9653,7 @@ sw_PushButton_DLG_MM_CUSTOMIZE_ADDRESS_LIST_PB_RENAME,1435292165,
 sw_PushButton_DLG_MM_DOCSELECT_PAGE_PB_BROWSETEMPLATE,898208263,
 sw_PushButton_DLG_MM_DOCSELECT_PAGE_PB_LOADDOC,898208261,
 sw_PushButton_DLG_MM_FIND_ENTRY_PB_FIND,2509001221,
-sw_PushButton_DLG_MM_GREETINGS_PAGE_CB_GREETINGLINE_PB_ASSIGN,537121298,
+sw_PushButton_DLG_MM_GREETINGS_PAGE_PB_ASSIGN,898257426,
 sw_PushButton_DLG_MM_LAYOUT_PAGE_MF_UP,898503177,
 sw_PushButton_DLG_MM_LAYOUT_PAGE_PB_DOWN,898503179,
 sw_PushButton_DLG_MM_MERGE_PAGE_PB_EDIT,898290179,
@@ -9667,9 +9674,6 @@ sw_PushButton_DLG_MM_SELECTADDRESSBLOCK_PB_CUSTOMIZE,1435324951,
 sw_PushButton_DLG_MM_SELECTADDRESSBLOCK_PB_DELETE,1435324950,
 sw_PushButton_DLG_MM_SELECTADDRESSBLOCK_PB_NEW,1435324949,
 sw_PushButton_DLG_MM_SELECTDBTABLEDDIALOG_PB_PREVIEW,1435210243,
-sw_PushButton_DLG_MM_SENDMAILS_PB_CLOSE,2509165126,
-sw_PushButton_DLG_MM_SENDMAILS_PB_DETAILS,2509165122,
-sw_PushButton_DLG_MM_SENDMAILS_PB_STOP,2509165125,
 sw_PushButton_DLG_MM_TESTACCOUNTSETTINGS_PB_STOP,1427132964,
 sw_PushButton_DLG_PAGEPREVIEW_PRINTOPTIONS_PB_STANDARD,1411289624,
 sw_PushButton_DLG_SORTING_PB_DELIM,1428771362,