INTEGRATION: CWS hcshared07 (1.9.16); FILE MERGED

2006/12/07 13:55:14 ufi 1.9.16.2: RESYNC: (1.9-1.10); FILE MERGED
2006/12/07 10:28:30 ufi 1.9.16.1: before resync

1 files changed, 36 insertions, 32 deletions

diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index 1e092089d3..5405a483bd 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -1125,6 +1125,7 @@ HID_CONTENT_OPT,53191,
 HID_CONTROLS_DATE_N_TIME,38194,
 HID_CTL_ACTION_DLG_1,59870,
 HID_CTL_ACTION_DLG_2,59871,
+HID_CTL_FONTWORK_FAVORITES,33862,
 HID_CTL_ORGANIZER_LEFT,33103,
 HID_CTL_ORGANIZER_RIGHT,33104,
 HID_CTL_QRYDGNCRIT,38861,
@@ -3056,7 +3057,6 @@ HID_PROP_XSD_RELEVANT,38000,
 HID_PROP_XSD_REQUIRED,37999,
 HID_PROP_XSD_TOTAL_DIGITS,37935,
 HID_PROP_XSD_WHITESPACES,38005,
-HID_PROTOCOLS,34768,
 HID_PVIEW_TOOLBOX,54841,
 HID_PVIEW_ZOOM_LB,54945,
 HID_QRYDGN_ROW_ALIAS,38867,
@@ -4685,6 +4685,7 @@ SID_DELETE_CONTENTS,26553,.uno:ClearContents
 SID_DELETE_FRAME,5652,.uno:DeleteFrame
 SID_DELETE_LAYER,27081,.uno:DeleteLayer
 SID_DELETE_MASTER_PAGE,27432,.uno:DeleteMasterPage
+SID_DELETE_NOTE,26478,
 SID_DELETE_PAGE,27080,.uno:DeletePage
 SID_DELETE_PRINTAREA,26603,.uno:DeletePrintArea
 SID_DELETE_SCENARIO,26666,.uno:DeleteScenario
@@ -5759,7 +5760,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.m189,010101010101010,
+SRC680.m196,010101010101010,
 SW_BEZIERSHELL,266,
 SW_DRAWFORMSHELL,268,
 SW_DRAWSHELL,258,
@@ -6188,7 +6189,6 @@ desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER,586088966,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER,586088967,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NOW,586088965,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_REG,586088968,
-extensions_CheckBox_MD_PROTCHK_DIALOG_CB_PERFORM,1330988048,
 extensions_CheckBox_RID_DLG_SELECTLABELCONTROL_1,1090126849,
 extensions_CheckBox_RID_PAGE_FINAL_CB_REGISTER_DS,860685313,
 extensions_CheckBox_RID_SANE_DIALOG_RID_SCAN_ADVANCED_BOX,1090126881,
@@ -6246,9 +6246,9 @@ extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD,859770374,
 extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_TABLE_LB_SELECTTABLE,859753989,
 extensions_ListBox_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS,859704835,
 extensions_ListBox_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD,859721220,
+extensions_ListBox_RID_PAGE_TABLESELECTION_AB_LB_TABLELIST,860655105,
 extensions_ListBox_RID_PAGE_TABLESELECTION_LB_DATASOURCE,859655681,
 extensions_ListBox_RID_PAGE_TABLESELECTION_LB_TABLE,859655682,
-extensions_ListBox_RID_PAGE_TABLESELECTION_LB_TABLELIST,860655105,
 extensions_ListBox_RID_SANE_DIALOG_RID_DEVICE_BOX,1090129414,
 extensions_ListBox_RID_SANE_DIALOG_RID_SCAN_QUANTUM_RANGE_BOX,1090129433,
 extensions_ListBox_RID_SANE_DIALOG_RID_SCAN_STRING_RANGE_BOX,1090129434,
@@ -6257,7 +6257,6 @@ extensions_MetricField_RID_SANE_DIALOG_RID_SCAN_LEFT_BOX,1090132489,
 extensions_MetricField_RID_SANE_DIALOG_RID_SCAN_RIGHT_BOX,1090132493,
 extensions_MetricField_RID_SANE_DIALOG_RID_SCAN_TOP_BOX,1090132490,
 extensions_ModalDialog_GRID_DIALOG,1091764224,
-extensions_ModalDialog_MD_PROTCHK_DIALOG,1330987008,
 extensions_ModalDialog_RID_DLG_FORMLINKS,1090158592,
 extensions_ModalDialog_RID_DLG_GRIDWIZARD,1396555776,
 extensions_ModalDialog_RID_DLG_GROUPBOXWIZARD,1396523008,
@@ -6272,7 +6271,6 @@ extensions_MultiLineEdit_RID_TP_LICENSE_ML_LICENSE,553667083,
 extensions_NumericBox_RID_SANE_DIALOG_RID_SCAN_RESOLUTION_BOX,1090135057,
 extensions_NumericField_RID_SANE_DIALOG_RID_SCAN_NUMERIC_VECTOR_BOX,1090131997,
 extensions_PushButton_GRID_DIALOG_GRID_DIALOG_RESET_BTN,1091768835,
-extensions_PushButton_MD_PROTCHK_DIALOG_BT_DETAILS,1330991620,
 extensions_PushButton_RID_DLG_FORMLINKS_PB_SUGGEST,1090163204,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_NEXT,1090523650,
 extensions_PushButton_RID_DLG_OEMWIZARD_PB_PREV,1090523649,
@@ -6293,8 +6291,6 @@ extensions_PushButton_RID_SANE_DIALOG_RID_DEVICEINFO_BTN,1090130435,
 extensions_PushButton_RID_SANE_DIALOG_RID_PREVIEW_BTN,1090130450,
 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_DEFAULTFIELDSELECTION_RB_DEFSELECTION_NO,859685378,
 extensions_RadioButton_RID_PAGE_DEFAULTFIELDSELECTION_RB_DEFSELECTION_YES,859685377,
 extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO,859718148,
@@ -6323,7 +6319,8 @@ extensions_TabPage_RID_PAGE_OPTIONS_FINAL,859734016,
 extensions_TabPage_RID_PAGE_OPTIONVALUES,859701248,
 extensions_TabPage_RID_PAGE_OPTION_DBFIELD,859717632,
 extensions_TabPage_RID_PAGE_SELECTABTYPE,860618752,
-extensions_TabPage_RID_PAGE_TABLESELECTION,860651520,
+extensions_TabPage_RID_PAGE_TABLESELECTION,859652096,
+extensions_TabPage_RID_PAGE_TABLESELECTION_AB,860651520,
 extensions_TabPage_RID_TP_LICENSE,553664512,
 extensions_TabPage_RID_TP_WELCOME,553697280,
 filter_CheckBox_DLG_OPTIONS_BOOL_EXPORT_ALL,1090520065,
@@ -6333,17 +6330,19 @@ 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_TAB_GENER_CB_EXPORTEMPTYPAGES,867845142,
+filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTBOOKMARKS,867845139,
+filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTEMPTYPAGES,867845143,
+filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTFORMFIELDS,867845140,
 filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTNOTES,867845138,
 filter_CheckBox_RID_PDF_TAB_GENER_CB_REDUCEIMAGERESOLUTION,867845134,
 filter_CheckBox_RID_PDF_TAB_GENER_CB_TAGGEDPDF,867845137,
-filter_CheckBox_RID_PDF_TAB_GENER_CB_TRANSITIONEFFECTS,867845139,
-filter_CheckBox_RID_PDF_TAB_OPNFTR_CB_PGLY_FIRSTLEFT,867877982,
-filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENAB_ACCESS,867894401,
-filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENDAB_COPY,867894400,
-filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEC_ENCRYPT,867894382,
-filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEL_PERMISSIONS,867894387,
+filter_CheckBox_RID_PDF_TAB_OPNFTR_CB_PGLY_FIRSTLEFT,867877986,
+filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENAB_ACCESS,867894411,
+filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENDAB_COPY,867894410,
+filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEC_ENCRYPT,867894392,
+filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEL_PERMISSIONS,867894397,
 filter_CheckBox_RID_PDF_TAB_VPREFER_CB_DISPDOCTITLE,867861608,
+filter_CheckBox_RID_PDF_TAB_VPREFER_CB_TRANSITIONEFFECTS,867861614,
 filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVMENUBAR,867861610,
 filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVTOOLBAR,867861611,
 filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVWINCTRL,867861612,
@@ -6352,12 +6351,15 @@ filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_OPNFULL,867861607,
 filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_RESINIT,867861605,
 filter_ComboBox_RID_PDF_TAB_GENER_CO_REDUCEIMAGERESOLUTION,867848207,
 filter_Edit_RID_PDF_TAB_GENER_ED_PAGES,867846149,
-filter_ListBox_RID_PDF_TAB_GENER_LB_FORMSFORMAT,867847701,
+filter_ListBox_RID_PDF_TAB_GENER_LB_FORMSFORMAT,867847702,
 filter_MetricField_RID_PDF_TAB_GENER_NF_QUALITY,867850765,
+filter_MetricField_RID_PDF_TAB_OPNFTR_NUM_MAGNF_ZOOM,867883610,
 filter_ModalDialog_DLG_OPTIONS,1090519040,
 filter_NumericField_DLG_OPTIONS_NUM_FLD_QUALITY,1090525185,
-filter_PushButton_RID_PDF_TAB_SECURITY_BTN_OWNER_PWD,867897972,
-filter_PushButton_RID_PDF_TAB_SECURITY_BTN_USER_PWD,867897968,
+filter_NumericField_RID_PDF_TAB_OPNFTR_NUM_MAGNF_INITIAL_PAGE,867883100,
+filter_NumericField_RID_PDF_TAB_VPREFER_NUM_BOOKMARKLEVELS,867866738,
+filter_PushButton_RID_PDF_TAB_SECURITY_BTN_OWNER_PWD,867897982,
+filter_PushButton_RID_PDF_TAB_SECURITY_BTN_USER_PWD,867897978,
 filter_RadioButton_RID_PDF_TAB_GENER_RB_ALL,867844610,
 filter_RadioButton_RID_PDF_TAB_GENER_RB_JPEGCOMPRESSION,867844619,
 filter_RadioButton_RID_PDF_TAB_GENER_RB_LOSSLESSCOMPRESSION,867844618,
@@ -6367,21 +6369,24 @@ filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_DEFAULT,867877461,
 filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_VISIBLE,867877464,
 filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_WIDTH,867877463,
 filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_WIND,867877462,
+filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_ZOOM,867877465,
 filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_OPNMODE_OUTLINE,867877458,
 filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_OPNMODE_PAGEONLY,867877457,
 filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_OPNMODE_THUMBS,867877459,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_CONT,867877468,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_CONTFAC,867877469,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_DEFAULT,867877466,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_SINGPG,867877467,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_ANY_NOCOPY,867893887,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_COMMENT,867893886,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_FILLFORM,867893885,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_INSDEL,867893884,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_NONE,867893883,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_HIGHRES,867893881,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_LOWRES,867893880,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_NONE,867893879,
+filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_CONT,867877472,
+filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_CONTFAC,867877473,
+filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_DEFAULT,867877470,
+filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_SINGPG,867877471,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_ANY_NOCOPY,867893897,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_COMMENT,867893896,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_FILLFORM,867893895,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_INSDEL,867893894,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_NONE,867893893,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_HIGHRES,867893891,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_LOWRES,867893890,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_NONE,867893889,
+filter_RadioButton_RID_PDF_TAB_VPREFER_RB_ALLBOOKMARKLEVELS,867861104,
+filter_RadioButton_RID_PDF_TAB_VPREFER_RB_VISIBLEBOOKMARKLEVELS,867861105,
 fpicker_CheckBox_DLG_SVT_EXPLORERFILE_CB_AUTO_EXTENSION,1334641706,
 fpicker_CheckBox_DLG_SVT_EXPLORERFILE_CB_EXPLORERFILE_PASSWORD,1334641705,
 fpicker_CheckBox_DLG_SVT_EXPLORERFILE_CB_EXPLORERFILE_READONLY,1334641704,
@@ -6473,7 +6478,6 @@ padmin_MetricField_RID_RTS_OTHERPAGE_RID_RTS_OTHER_BOTTOMMARGIN_BOX,602446344,
 padmin_MetricField_RID_RTS_OTHERPAGE_RID_RTS_OTHER_LEFTMARGIN_BOX,602446338,
 padmin_MetricField_RID_RTS_OTHERPAGE_RID_RTS_OTHER_RIGHTMARGIN_BOX,602446342,
 padmin_MetricField_RID_RTS_OTHERPAGE_RID_RTS_OTHER_TOPMARGIN_BOX,602446340,
-padmin_MetricField_RID_RTS_PAPERPAGE_RID_RTS_PAPER_SCALE_BOX,602479114,
 padmin_ModalDialog_RID_ADD_PRINTER_DIALOG,1106509824,
 padmin_ModalDialog_RID_FONTIMPORT_DIALOG,1091190784,
 padmin_ModalDialog_RID_FONTNAMEDIALOG,1090617344,