merge with m61

3 files changed, 133 insertions, 77 deletions

diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index 290c0aa5a3..fc0a3ac4d2 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -1,7 +1,6 @@
 ,,
-0,0,
 1,1,
-DEV300.m46,010101010101010,
+DEV300.m57,010101010101010,
 DLG_INSERT_PAGES_OBJS,938,
 DLG_JOIN_TABADD,19214,
 FID_ADJUST_PRINTZOOM,26652,.uno:AdjustPrintZoom
@@ -83,6 +82,7 @@ FID_TABLE_HIDE,26289,.uno:Hide
 FID_TABLE_SHOW,26290,.uno:Show
 FID_TABLE_VISIBLE,26298,.uno:Visible
 FID_TAB_APPEND,26350,.uno:Add
+FID_TAB_DESELECTALL,26353,
 FID_TAB_MENU_RENAME,26346,.uno:RenameTable
 FID_TAB_MOVE,26348,.uno:Move
 FID_TAB_RENAME,26347,.uno:Name
@@ -500,7 +500,6 @@ FN_XFORMS_DESIGN_MODE,22300,.uno:SwitchXFormsDesignMode
 FN_XFORMS_INIT,21053,.uno:NewXForms
 FontWork1TBO,40026,
 FontWork2TBO,40027,
-HDE_PDF_EXPORT_DLG,33375,
 HID0_CANCEL,34205,
 HID0_CREATE,34204,
 HID0_HELP,34201,
@@ -666,7 +665,7 @@ HID_ABSPILOT_CANCEL,34833,
 HID_ABSPILOT_FINISH,34834,
 HID_ABSPILOT_NEXT,34832,
 HID_ABSPILOT_PREVIOUS,34831,
-HID_ACCELCONFIG_LISTBOX,33143,
+HID_ACCELCONFIG_LISTBOX,40078,
 HID_ADDRTEMPL_FIELD_ASSIGNMENT,32997,
 HID_ADD_STYLES_TLB,53244,
 HID_AGENDA_PAGE1,53299,
@@ -1150,9 +1149,9 @@ HID_COLUMN_VALUESET,54944,
 HID_COMPATIBILITY_OPTIONS_BOX,53252,
 HID_COND_COLL,53194,
 HID_COND_COLL_TABLIST,54844,
-HID_CONFIGFUNCTION_ACC_LISTBOX,33306,
-HID_CONFIGGROUP_ACC_LISTBOX,33307,
-HID_CONFIG_ACCEL,33080,
+HID_CONFIGFUNCTION_ACC_LISTBOX,40080,
+HID_CONFIGGROUP_ACC_LISTBOX,40079,
+HID_CONFIG_ACCEL,40077,
 HID_CONFIG_EVENT_DOCUMENT_BASED,33167,
 HID_CONFIG_EVENT_OFFICE_BASED,33166,
 HID_CONFIRM_DROP_BUTTON_ALL,38937,
@@ -1859,7 +1858,11 @@ HID_FILL_ATTR_LISTBOX,39869,
 HID_FILL_TYPE_LISTBOX,39870,
 HID_FILTER_NAVIGATOR,38072,
 HID_FILTER_NAVIGATOR_WIN,38073,
+HID_FILTER_PDF_INITIAL_VIEW,64150,
+HID_FILTER_PDF_LINKS,64153,
 HID_FILTER_PDF_OPTIONS,64149,
+HID_FILTER_PDF_SECURITY,64152,
+HID_FILTER_PDF_USER_INTERFACE,64151,
 HID_FIRSTSTART_CANCEL,42781,
 HID_FIRSTSTART_DIALOG,42773,
 HID_FIRSTSTART_FINISH,42782,
@@ -2574,11 +2577,11 @@ HID_LTRWIZ_TXTSENDERPOSTCODE,40804,
 HID_LTRWIZ_TXTSENDERSTATE_TEXT,40805,
 HID_LTRWIZ_TXTSENDERSTREET,40803,
 HID_LTRWIZ_TXTTEMPLATENAME,40812,
-HID_MACROCHECKDIALOG,33381,
-HID_MACRO_GROUP,33155,
-HID_MACRO_HEADERTABLISTBOX,33380,
-HID_MACRO_LB_EVENT,33132,
-HID_MACRO_MACROS,33156,
+HID_MACROCHECKDIALOG,40084,
+HID_MACRO_GROUP,40082,
+HID_MACRO_HEADERTABLISTBOX,40085,
+HID_MACRO_LB_EVENT,40081,
+HID_MACRO_MACROS,40083,
 HID_MACRO_MIGRATION_BACKUP_LOCATION,39152,
 HID_MAIL_MERGE_CREATE_FROM,54947,
 HID_MAIL_MERGE_INSERT_FIELDS,54948,
@@ -2871,7 +2874,6 @@ HID_OPTIONS_GENERAL,33811,
 HID_OPTIONS_GRID,33816,
 HID_OPTIONS_JAVA,39996,
 HID_OPTIONS_JAVA_CLASSPATH,39999,
-HID_OPTIONS_JAVA_LIST,39997,
 HID_OPTIONS_JAVA_PARAMETER,39998,
 HID_OPTIONS_LINGU,33812,
 HID_OPTIONS_MAIL,33842,
@@ -2908,6 +2910,7 @@ HID_PACKAGE_MANAGER_MENU_ITEM,42772,
 HID_PACKAGE_MANAGER_PROGRESS,42770,
 HID_PACKAGE_MANAGER_PROGRESS_CANCEL,42771,
 HID_PACKAGE_MANAGER_TREELISTBOX,42769,
+HID_PACKAGE_MANAGER_UPD_REQ,42797,
 HID_PAGEPREVIEW,52835,
 HID_PAGE_CONNECTION,33857,
 HID_PAGE_CONNECTION_CTL_PREVIEW,33858,
@@ -2992,6 +2995,7 @@ HID_PROP_ALIGN,37816,
 HID_PROP_ALLOW_ADDITIONS,37784,
 HID_PROP_ALLOW_DELETIONS,37786,
 HID_PROP_ALLOW_EDITS,37785,
+HID_PROP_ANCHOR_TYPE,38111,
 HID_PROP_AUTOCOMPLETE,37848,
 HID_PROP_AUTOLINEBREAK,37932,
 HID_PROP_BACKGROUNDCOLOR,37811,
@@ -3020,28 +3024,31 @@ HID_PROP_DATEFORMAT,37836,
 HID_PROP_DATEMAX,37835,
 HID_PROP_DATEMIN,37834,
 HID_PROP_DECIMAL_ACCURACY,37861,
+HID_PROP_DECORATION,38020,
 HID_PROP_DEFAULTVALUE,37827,
 HID_PROP_DEFAULT_BUTTON,37863,
-HID_PROP_DEFAULT_CHECKED,37829,
 HID_PROP_DEFAULT_DATE,37871,
 HID_PROP_DEFAULT_LONG_VALUE,37869,
 HID_PROP_DEFAULT_SCROLLVALUE,37905,
 HID_PROP_DEFAULT_SELECT_SEQ,37831,
 HID_PROP_DEFAULT_SPINVALUE,37911,
+HID_PROP_DEFAULT_STATE,37829,
 HID_PROP_DEFAULT_TIME,37870,
 HID_PROP_DIRTY,37787,
 HID_PROP_DROPDOWN,37817,
 HID_PROP_ECHO_CHAR,37859,
+HID_PROP_EDITABLE,38025,
 HID_PROP_EDITMASK,37845,
 HID_PROP_EFFECTIVEDEFAULT,37878,
 HID_PROP_EFFECTIVEMAX,37877,
 HID_PROP_EFFECTIVEMIN,37876,
 HID_PROP_EMPTY_IS_NULL,37860,
 HID_PROP_ENABLED,37847,
+HID_PROP_ENABLE_VISIBLE,37862,
 HID_PROP_ESCAPE_PROCESSING,37881,
 HID_PROP_FILLCOLOR,37812,
+HID_PROP_FILTER,37867,
 HID_PROP_FILTERPROPOSAL,37875,
-HID_PROP_FILTER_CRITERIA,37867,
 HID_PROP_FOCUSONCLICK,38102,
 HID_PROP_FONT,37809,
 HID_PROP_FORMATKEY,37791,
@@ -3054,9 +3061,9 @@ HID_PROP_HIDEINACTIVESELECTION,38103,
 HID_PROP_HSCROLL,37819,
 HID_PROP_ICONSIZE,37927,
 HID_PROP_IMAGEPOSITION,38107,
-HID_PROP_IMAGE_ALIGN,37882,
 HID_PROP_IMAGE_URL,37830,
 HID_PROP_INPUT_REQUIRED,37769,
+HID_PROP_INVOKES_STOP_NOT_EDITING,38026,
 HID_PROP_LABEL,37806,
 HID_PROP_LEFT,37797,
 HID_PROP_LINECOLOR,37814,
@@ -3094,21 +3101,24 @@ HID_PROP_REPEAT,37913,
 HID_PROP_REPEAT_DELAY,37906,
 HID_PROP_REQUIRED,37792,
 HID_PROP_RIGHT,37798,
+HID_PROP_ROOT_DISPLAYED,38022,
 HID_PROP_ROWHEIGHT,37810,
-HID_PROP_SCALE,37793,
+HID_PROP_ROW_HEIGHT,38027,
 HID_PROP_SCALEIMAGE,37899,
 HID_PROP_SCROLLVALUE,37889,
 HID_PROP_SCROLLVALUE_MAX,37890,
 HID_PROP_SCROLLVALUE_MIN,37904,
 HID_PROP_SEARCHING,37808,
 HID_PROP_SELECTEDITEMS,37903,
+HID_PROP_SELECTION_TYPE,38021,
+HID_PROP_SHOWS_HANDLES,38023,
+HID_PROP_SHOWS_ROOT_HANDLES,38024,
 HID_PROP_SHOWTHOUSANDSEP,37853,
 HID_PROP_SHOW_FILTERSORT,37931,
 HID_PROP_SHOW_NAVIGATION,37929,
 HID_PROP_SHOW_POSITION,37928,
 HID_PROP_SHOW_RECORDACTIONS,37930,
 HID_PROP_SHOW_SCROLLBARS,37915,
-HID_PROP_SIZE,37794,
 HID_PROP_SLAVEFIELDS,37775,
 HID_PROP_SORT_CRITERIA,37868,
 HID_PROP_SPIN,37851,
@@ -3133,7 +3143,6 @@ HID_PROP_TAG,37858,
 HID_PROP_TARGET_FRAME,37857,
 HID_PROP_TARGET_URL,37856,
 HID_PROP_TEXT,37805,
-HID_PROP_TEXTCOLOR,37813,
 HID_PROP_TEXTTYPE,37933,
 HID_PROP_TIME,37837,
 HID_PROP_TIMEFORMAT,37840,
@@ -3148,9 +3157,11 @@ HID_PROP_VALUE,37789,
 HID_PROP_VALUEMAX,37842,
 HID_PROP_VALUEMIN,37841,
 HID_PROP_VALUESTEP,37843,
+HID_PROP_VERTICAL_ALIGN,37854,
 HID_PROP_VISIBLESIZE,37893,
 HID_PROP_VISUALEFFECT,38104,
 HID_PROP_VSCROLL,37820,
+HID_PROP_WHEEL_BEHAVIOR,37793,
 HID_PROP_WIDTH,37800,
 HID_PROP_WORDBREAK,37914,
 HID_PROP_WRITING_MODE,38109,
@@ -3172,6 +3183,7 @@ 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,
@@ -3325,6 +3337,9 @@ HID_RPT_FIELDEXPRESSION,64461,
 HID_RPT_FIELD_SEL,64473,
 HID_RPT_FIELD_SEL_WIN,64474,
 HID_RPT_GROUPSBRW,64463,
+HID_RPT_GROUPSORT_DELETE,64533,
+HID_RPT_GROUPSORT_MOVE_DOWN,64532,
+HID_RPT_GROUPSORT_MOVE_UP,64531,
 HID_RPT_GROUPSSORTING_DLG,64464,
 HID_RPT_HORZ_RULER,64452,
 HID_RPT_HORZ_SCROLLBAR,64458,
@@ -3357,6 +3372,7 @@ HID_RPT_PROP_MINHEIGHTNEWPAGE,64500,
 HID_RPT_PROP_NEWROWORCOL,64478,
 HID_RPT_PROP_PAGEFOOTEROPTION,64507,
 HID_RPT_PROP_PAGEHEADEROPTION,64506,
+HID_RPT_PROP_PARAADJUST,64499,
 HID_RPT_PROP_PREEVALUATED,64519,
 HID_RPT_PROP_PRESERVEIRI,64526,
 HID_RPT_PROP_PREVIEW_COUNT,64509,
@@ -3373,6 +3389,7 @@ HID_RPT_PROP_SCOPE,64484,
 HID_RPT_PROP_STARTNEWCOLUMN,64496,
 HID_RPT_PROP_STARTNEWPAGE,64497,
 HID_RPT_PROP_TYPE,64485,
+HID_RPT_PROP_VERTICALALIGN,64495,
 HID_RPT_PROP_VISIBLE,64504,
 HID_RPT_SORTORDER,64462,
 HID_RPT_SPLITTER,64456,
@@ -3410,6 +3427,8 @@ HID_SCH_CT_INDICATE,63291,
 HID_SCH_DATALABEL_NUMBER,63356,
 HID_SCH_DATALABEL_PERCENT,63357,
 HID_SCH_DATALABEL_PLACEMENT,63371,
+HID_SCH_DATALABEL_ROTATION_EDIT,63399,
+HID_SCH_DATALABEL_ROTATION_KNOB,63398,
 HID_SCH_DATALABEL_SEPARATOR,63370,
 HID_SCH_DATALABEL_SYMBOL,63359,
 HID_SCH_DATALABEL_TEXT,63358,
@@ -4417,8 +4436,6 @@ MSC_Super_ID,123456,
 MSC_Super_ID2,1234567,
 MSC_Super_ID3,12345678,
 MSG_QUERY_LOAD_TEMPLATE,2065,
-PDF1TBO,867876864,
-PDF2TBO,867860480,
 RID_ENVTOOLBOX,560,
 RID_MATH_TOOLBOX,20050,
 RID_MN_FORMAT_STYLE,25031,
@@ -4733,7 +4750,6 @@ SID_BROWSE_BACKWARD,6301,.uno:BrowseBackward
 SID_BROWSE_FORWARD,6300,.uno:BrowseForward
 SID_BROWSE_STOP,6302,.uno:Stop
 SID_BUILD_VERSION,6569,.uno:BuildVersion
-SID_BULLET,27019,.uno:Bullet
 SID_CANCEL,26557,.uno:Cancel
 SID_CAPTION,5641,.uno:Caption
 SID_CAPTUREPOINT,27038,.uno:CapturePoint
@@ -4937,7 +4953,7 @@ SID_DB_NEW,12253,
 SID_DB_NEW_VIEW_SQL,12315,
 SID_DB_QUERY_PREVIEW,12303,
 SID_DEC_INDENT,10461,.uno:DecrementIndent
-SID_DEFAULTFILENAME,6716,
+SID_DEFAULTFILENAME,6717,
 SID_DEFAULTFILEPATH,5571,.uno:DefaultFilePath
 SID_DEFINE_COLROWNAMERANGES,26629,.uno:DefineLabelRange
 SID_DEFINE_DBNAME,26320,.uno:DefineDBName
@@ -5421,6 +5437,7 @@ SID_INSERT_FLD_DATE_FIX,27358,.uno:InsertDateFieldFix
 SID_INSERT_FLD_DATE_VAR,27357,.uno:InsertDateFieldVar
 SID_INSERT_FLD_FILE,27363,.uno:InsertFileField
 SID_INSERT_FLD_PAGE,27361,.uno:InsertPageField
+SID_INSERT_FLD_PAGES,27373,
 SID_INSERT_FLD_PGNUMBER,12455,
 SID_INSERT_FLD_TIME_FIX,27360,.uno:InsertTimeFieldFix
 SID_INSERT_FLD_TIME_VAR,27359,.uno:InsertTimeFieldVar
@@ -5670,6 +5687,7 @@ SID_PARTWIN,6640,.uno:PartWindow
 SID_PASTE,5712,.uno:Paste
 SID_PASTE2,27003,.uno:PasteClipboard
 SID_PASTEOBJECT,30374,
+SID_PASTE_UNFORMATTED,5314,
 SID_PICKLIST,5510,.uno:PickList
 SID_PICK_THROUGH,27159,.uno:PickThrough
 SID_PIVOT_CREATE,26660,.uno:DataPilotCreate
@@ -5815,6 +5833,10 @@ SID_SECTION_ALIGN_LEFT,12605,
 SID_SECTION_ALIGN_MIDDLE,12609,
 SID_SECTION_ALIGN_RIGHT,12607,
 SID_SECTION_ALIGN_UP,12608,
+SID_SECTION_SHRINK,12615,
+SID_SECTION_SHRINK_BOTTOM,12617,
+SID_SECTION_SHRINK_MENU,12618,
+SID_SECTION_SHRINK_TOP,12616,
 SID_SELECT,5720,.uno:Select
 SID_SELECTALL,5723,.uno:SelectAll
 SID_SELECTALL_IN_SECTION,12601,
@@ -5935,7 +5957,9 @@ SID_TABLE_DELETE_ROW,11078,
 SID_TABLE_DISTRIBUTE_COLUMNS,11086,
 SID_TABLE_DISTRIBUTE_ROWS,11087,
 SID_TABLE_INSERT_COL,11077,
+SID_TABLE_INSERT_COL_DLG,10426,
 SID_TABLE_INSERT_ROW,11076,
+SID_TABLE_INSERT_ROW_DLG,10427,
 SID_TABLE_MERGE_CELLS,11070,
 SID_TABLE_SELECT_ALL,11080,
 SID_TABLE_SELECT_COL,11081,
@@ -5983,6 +6007,7 @@ SID_TOOLBOXWINDOW,30379,
 SID_TOOL_CONNECTOR,27058,.uno:Connector
 SID_TP_APPLY_TO_ALL_SLIDES,27425,
 SID_TP_APPLY_TO_SELECTED_SLIDES,27426,
+SID_TP_EDIT_MASTER,27439,
 SID_TP_SHOW_LARGE_PREVIEW,27428,
 SID_TP_SHOW_SMALL_PREVIEW,27429,
 SID_TP_USE_FOR_NEW_PRESENTATIONS,27427,
@@ -6302,7 +6327,9 @@ chart2_CheckBox_TP_CHARTTYPE_CB_XVALUE_SORTING,551781381,
 chart2_CheckBox_TP_CHARTTYPE_CB_X_AXIS_CATEGORIES,551781377,
 chart2_CheckBox_TP_OPTIONS_CB_BARS_SIDE_BY_SIDE,551748618,
 chart2_CheckBox_TP_OPTIONS_CB_CONNECTOR,551748617,
+chart2_CheckBox_TP_OPTIONS_CB_INCLUDE_HIDDEN_CELLS,551748624,
 chart2_CheckBox_TP_POLAROPTIONS_CB_CLOCKWISE,551764993,
+chart2_CheckBox_TP_POLAROPTIONS_CB_INCLUDE_HIDDEN_CELLS_POLAR,551764994,
 chart2_CheckBox_TP_RANGECHOOSER_CB_FIRST_COLUMN_ASLABELS,551797762,
 chart2_CheckBox_TP_RANGECHOOSER_CB_FIRST_ROW_ASLABELS,551797761,
 chart2_CheckBox_TP_SCALE_CBX_AUTO_MAX,551666690,
@@ -6370,9 +6397,9 @@ chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Y_PERCENT,551780867,
 chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Z,551780868,
 chart2_RadioButton_TP_OPTIONS_RBT_OPT_AXIS_1,551748098,
 chart2_RadioButton_TP_OPTIONS_RBT_OPT_AXIS_2,551748099,
-chart2_RadioButton_TP_OPTIONS_RB_ASSUME_ZERO,551748109,
-chart2_RadioButton_TP_OPTIONS_RB_CONTINUE_LINE,551748110,
-chart2_RadioButton_TP_OPTIONS_RB_DONT_PAINT,551748108,
+chart2_RadioButton_TP_OPTIONS_RB_ASSUME_ZERO,551748110,
+chart2_RadioButton_TP_OPTIONS_RB_CONTINUE_LINE,551748111,
+chart2_RadioButton_TP_OPTIONS_RB_DONT_PAINT,551748109,
 chart2_RadioButton_TP_RANGECHOOSER_RB_DATACOLS,551797250,
 chart2_RadioButton_TP_RANGECHOOSER_RB_DATAROWS,551797249,
 chart2_SpinField_TP_AXIS_POSITIONS_EDT_AXIS_LABEL_DISTANCE,551687173,
@@ -6402,6 +6429,7 @@ dbaccess_CheckBox_PAGE_ADABAS_CB_SHUTDB,851526657,
 dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041,
 dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953,
 dbaccess_CheckBox_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN,851641349,
+dbaccess_CheckBox_TAB_WIZ_COPYTABLE_CB_USEHEADERLINE,851641350,
 dbaccess_ComboBox_DLG_DBASE_INDEXES_CB_TABLES,1388335105,
 dbaccess_ComboBox_DLG_SAVE_AS_ET_CATALOG,1388498945,
 dbaccess_ComboBox_DLG_SAVE_AS_ET_SCHEMA,1388498946,
@@ -6506,7 +6534,6 @@ dbaccess_PushButton_PAGE_CONNECTION_PB_TESTDRIVERCLASS,851546625,
 dbaccess_PushButton_PAGE_GENERAL_PB_OPENDOCUMENT,851448326,
 dbaccess_PushButton_PAGE_MYSQL_JDBC_PB_TESTDRIVERCLASS,851776005,
 dbaccess_PushButton_PAGE_ORACLE_JDBC_PB_TESTDRIVERCLASS,851890693,
-dbaccess_PushButton_RID_EXTENSION_NOT_PRESENT_DLG_PB_DOWNLOAD,1388810762,
 dbaccess_PushButton_TAB_WIZ_NAME_MATCHING_PB_ALL,851628560,
 dbaccess_PushButton_TAB_WIZ_NAME_MATCHING_PB_NONE,851628561,
 dbaccess_PushButton_TAB_WIZ_TYPE_SELECT_PB_AUTO,851612165,
@@ -6549,16 +6576,11 @@ desktop_MultiLineEdit_RID_DLG_LICENSE_ML_LICENSE,1180240435,
 desktop_MultiLineEdit_RID_DLG_UPDATEINSTALL_RID_DLG_UPDATE_INSTALL_INFO,1106840076,
 desktop_MultiLineEdit_RID_DLG_UPDATE_RID_DLG_UPDATE_DESCRIPTIONS,1106676231,
 desktop_MultiLineEdit_TP_LICENSE_ML_LICENSE,586140166,
-desktop_PushButton_RID_DLG_EXTENSION_MANAGER_RID_EM_BTN_ADD,2180354572,
-desktop_PushButton_RID_DLG_EXTENSION_MANAGER_RID_EM_BTN_CHECK_UPDATES,2180354573,
+desktop_PushButton_RID_DLG_EXTENSION_MANAGER_RID_EM_BTN_ADD,2180256268,
+desktop_PushButton_RID_DLG_EXTENSION_MANAGER_RID_EM_BTN_CHECK_UPDATES,2180256269,
 desktop_PushButton_RID_DLG_LICENSE_PB_LICENSE_DOWN,1180242482,
-desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ADD,2180256276,
-desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_CHECK_UPDATES,2180256281,
-desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_DISABLE,2180256279,
-desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ENABLE,2180256278,
-desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_EXPORT,2180256280,
-desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_OPTIONS,2180256282,
-desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_REMOVE,2180256277,
+desktop_PushButton_RID_DLG_UPDATE_REQUIRED_RID_EM_BTN_CHECK_UPDATES,1106694669,
+desktop_PushButton_RID_DLG_UPDATE_REQUIRED_RID_EM_BTN_CLOSE,1106694666,
 desktop_PushButton_RID_DLG_UPDATE_RID_DLG_UPDATE_OK,1106678282,
 desktop_PushButton_TP_LICENSE_PB_LICENSE_DOWN,586142215,
 desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER,586088966,
@@ -6942,8 +6964,6 @@ padmin_TabPage_RID_RTS_PAPERPAGE,602472448,
 reportdesign_CheckBox_RID_DATETIME_DLG_CB_DATE,1577878529,
 reportdesign_CheckBox_RID_DATETIME_DLG_CB_TIME,1577878533,
 reportdesign_CheckBox_RID_PAGENUMBERS_CB_SHOWNUMBERONFIRSTPAGE,1577862153,
-reportdesign_ImageButton_RID_GROUPS_SORTING_PB_DOWN,2114727445,
-reportdesign_ImageButton_RID_GROUPS_SORTING_PB_UP,2114727444,
 reportdesign_ListBox_RID_DATETIME_DLG_LB_DATE_TYPE,1577881091,
 reportdesign_ListBox_RID_DATETIME_DLG_LB_TIME_TYPE,1577881095,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_FOOTERLST,2114719236,
@@ -7043,6 +7063,7 @@ sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_FILTER,2567504925,
 sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_IGNEMPTYROWS,2567504921,
 sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALCOL,2567504923,
 sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALROW,2567504924,
+sc_CheckBox_RID_SCDLG_RETYPEPASS_INPUT_BTN_MATCH_OLD_PASSWORD,1495680305,
 sc_CheckBox_RID_SCDLG_ROW_MAN_BTN_DEFVAL,1494942721,
 sc_CheckBox_RID_SCDLG_ROW_OPT_BTN_DEFVAL,1494959105,
 sc_CheckBox_RID_SCDLG_SHAREDOCUMENT_CB_SHARE,1495598081,
@@ -7052,6 +7073,7 @@ sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_DEST_PERS,2567095308,
 sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_HEADER,2567095300,
 sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_REGEXP,2567095299,
 sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_UNIQUE,2567095297,
+sc_CheckBox_RID_SCDLG_TABPROTECTION_BTN_PROTECT,1495630852,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_CALC,957252625,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_CASE,957252623,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_ITERATE,957252609,
@@ -7113,6 +7135,7 @@ sc_ComboBox_RID_SCDLG_DBNAMES_ED_NAME,2567327755,
 sc_ComboBox_RID_SCDLG_FILTER_ED_VAL1,2567082016,
 sc_ComboBox_RID_SCDLG_FILTER_ED_VAL2,2567082017,
 sc_ComboBox_RID_SCDLG_FILTER_ED_VAL3,2567082018,
+sc_ComboBox_RID_SCDLG_FILTER_ED_VAL4,2567082024,
 sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_FIELDSEP,1494175749,
 sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_TEXTSEP,1494175751,
 sc_ComboBox_RID_SCDLG_LINKAREA_CB_URL,1495371781,
@@ -7164,7 +7187,10 @@ sc_Edit_RID_SCDLG_OPTSOLVER_ED_RIGHT3,2569209866,
 sc_Edit_RID_SCDLG_OPTSOLVER_ED_RIGHT4,2569209867,
 sc_Edit_RID_SCDLG_OPTSOLVER_ED_TARGET,2569209858,
 sc_Edit_RID_SCDLG_OPTSOLVER_ED_VARIABLECELLS,2569209859,
+sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_INAREA,2567505962,
 sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_OUTAREA,2567505943,
+sc_Edit_RID_SCDLG_RETYPEPASS_INPUT_ED_PASSWORD1,1495681326,
+sc_Edit_RID_SCDLG_RETYPEPASS_INPUT_ED_PASSWORD2,1495681328,
 sc_Edit_RID_SCDLG_SIMPLEREF_ED_ASSIGN,2568996875,
 sc_Edit_RID_SCDLG_SOLVER_DOUBLE_ED_VALUE,1495517185,
 sc_Edit_RID_SCDLG_SOLVER_ED_FORMULACELL,2567374849,
@@ -7176,6 +7202,8 @@ sc_Edit_RID_SCDLG_STRINPUT_ED_INPUT,1493469194,
 sc_Edit_RID_SCDLG_TABOP_ED_COLCELL,2567899139,
 sc_Edit_RID_SCDLG_TABOP_ED_FORMULARANGE,2567899137,
 sc_Edit_RID_SCDLG_TABOP_ED_ROWCELL,2567899138,
+sc_Edit_RID_SCDLG_TABPROTECTION_ED_PASSWORD1,1495631878,
+sc_Edit_RID_SCDLG_TABPROTECTION_ED_PASSWORD2,1495631880,
 sc_Edit_RID_SCPAGE_CALC_ED_EPS,957253637,
 sc_Edit_RID_SCPAGE_SORT_OPTIONS_ED_OUTAREA,956450820,
 sc_Edit_RID_SCPAGE_USERLISTS_ED_COPYFROM,956844035,
@@ -7218,6 +7246,7 @@ sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_RIGHT3,2569219594,
 sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_RIGHT4,2569219595,
 sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_TARGET,2569219586,
 sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_VARIABLECELLS,2569219587,
+sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_OUTAREA,2567515672,
 sc_ImageButton_RID_SCDLG_SIMPLEREF_RB_ASSIGN,2569006604,
 sc_ImageButton_RID_SCDLG_SOLVER_RB_FORMULACELL,2567384577,
@@ -7264,12 +7293,16 @@ sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_SORT_BY,1495404037,
 sc_ListBox_RID_SCDLG_FILTER_LB_COND1,2567081501,
 sc_ListBox_RID_SCDLG_FILTER_LB_COND2,2567081502,
 sc_ListBox_RID_SCDLG_FILTER_LB_COND3,2567081503,
+sc_ListBox_RID_SCDLG_FILTER_LB_COND4,2567081511,
 sc_ListBox_RID_SCDLG_FILTER_LB_COPY_AREA,2567081478,
 sc_ListBox_RID_SCDLG_FILTER_LB_FIELD1,2567081496,
 sc_ListBox_RID_SCDLG_FILTER_LB_FIELD2,2567081497,
 sc_ListBox_RID_SCDLG_FILTER_LB_FIELD3,2567081498,
+sc_ListBox_RID_SCDLG_FILTER_LB_FIELD4,2567081510,
 sc_ListBox_RID_SCDLG_FILTER_LB_OP1,2567081499,
 sc_ListBox_RID_SCDLG_FILTER_LB_OP2,2567081500,
+sc_ListBox_RID_SCDLG_FILTER_LB_OP3,2567081509,
+sc_ListBox_RID_SCDLG_FILTER_LB_OP4,2567081514,
 sc_ListBox_RID_SCDLG_IMPORTOPT_DDLB_FONT,1494175241,
 sc_ListBox_RID_SCDLG_IMPORTOPT_LB_FONT,1494175242,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338,
@@ -7328,7 +7361,11 @@ sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
 sc_ModalDialog_RID_SCDLG_INSERT_TABLE,1493893120,
 sc_ModalDialog_RID_SCDLG_LINKAREA,1495367680,
 sc_ModalDialog_RID_SCDLG_NEWSCENARIO,1493843968,
+sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592,
+sc_ModalDialog_RID_SCDLG_RETYPEPASS_INPUT,1495678976,
+sc_ModalDialog_RID_SCDLG_SORT_WARNING,1495613440,
 sc_ModalDialog_RID_SCDLG_STRINPUT,1493467136,
+sc_ModalDialog_RID_SCDLG_TABPROTECTION,1495629824,
 sc_ModelessDialog_RID_SCDLG_SIMPLEREF,2568994816,
 sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576,
 sc_MoreButton_RID_SCDLG_CONSOLIDATE_BTN_MORE,2567533060,
@@ -7366,6 +7403,9 @@ sc_PushButton_RID_SCDLG_AUTOFORMAT_BTN_ADD,1493537385,
 sc_PushButton_RID_SCDLG_AUTOFORMAT_BTN_REMOVE,1493537386,
 sc_PushButton_RID_SCDLG_COLROWNAMERANGES_BTN_ADD,2568786435,
 sc_PushButton_RID_SCDLG_COLROWNAMERANGES_BTN_REMOVE,2568786436,
+sc_PushButton_RID_SCDLG_CONDFORMAT_BTN_COND1_NEW,2568524322,
+sc_PushButton_RID_SCDLG_CONDFORMAT_BTN_COND2_NEW,2568524323,
+sc_PushButton_RID_SCDLG_CONDFORMAT_BTN_COND3_NEW,2568524324,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLMINE,1495585286,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLOTHERS,1495585287,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPMINE,1495585283,
@@ -7384,7 +7424,14 @@ sc_PushButton_RID_SCDLG_OPTSOLVER_BTN_SOLVE,2569212420,
 sc_PushButton_RID_SCDLG_PIVOTSUBT_BTN_OPTIONS,1493832197,
 sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_OPTIONS,2567508486,
 sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_REMOVE,2567508485,
+sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_DOC,1495667213,
+sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET1,1495667315,
+sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET2,1495667318,
+sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET3,1495667321,
+sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET4,1495667324,
 sc_PushButton_RID_SCDLG_SOLVEROPTIONS_BTN_EDIT,1495486977,
+sc_PushButton_RID_SCDLG_SORT_WARNING_BTN_CURSORT,1495618052,
+sc_PushButton_RID_SCDLG_SORT_WARNING_BTN_EXTSORT,1495618051,
 sc_PushButton_RID_SCPAGE_USERLISTS_BTN_ADD,956846594,
 sc_PushButton_RID_SCPAGE_USERLISTS_BTN_COPY,956846596,
 sc_PushButton_RID_SCPAGE_USERLISTS_BTN_NEW,956846593,
@@ -7450,6 +7497,8 @@ sc_RadioButton_RID_SCDLG_OPTSOLVER_RB_VALUE,2569208323,
 sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_AUTO,1493828098,
 sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_NONE,1493828097,
 sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_USER,1493828099,
+sc_RadioButton_RID_SCDLG_RETYPEPASS_INPUT_BTN_REMOVE_PASSWORD,1495679795,
+sc_RadioButton_RID_SCDLG_RETYPEPASS_INPUT_BTN_RETYPE_PASSWORD,1495679794,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATE1904,957252107,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESC10,957252106,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESTD,957252105,
@@ -7831,7 +7880,6 @@ sfx2_ListBox_DLG_NEW_FILE_LB_REGION,1107381781,
 sfx2_ListBox_DLG_NEW_FILE_LB_TEMPLATE,1107381812,
 sfx2_ListBox_DLG_ORGANIZE_LB_LEFT_TYP,1107414530,
 sfx2_ListBox_DLG_ORGANIZE_LB_RIGHT_TYP,1107414539,
-sfx2_ListBox_RID_SFX_TP_MACROASSIGN_LB_SCRIPTTYPE,575786504,
 sfx2_ListBox_RID_STYLECATALOG_BT_FLIST,1097682440,
 sfx2_ListBox_RID_STYLECATALOG_BT_TOOL,1097682442,
 sfx2_ListBox_TP_COMMONPRINTOPTIONS_LB_REDUCEBITMAPS_RESOLUTION,576163363,
@@ -7868,18 +7916,11 @@ sfx2_PushButton_DLG_VERSIONS_PB_OPEN,1112691206,
 sfx2_PushButton_DLG_VERSIONS_PB_SAVE,1112691202,
 sfx2_PushButton_DLG_VERSIONS_PB_VIEW,1112691213,
 sfx2_PushButton_RID_DLG_SEARCH_PB_FIND,2187088401,
-sfx2_PushButton_RID_SFX_TP_MACROASSIGN_PB_ASSIGN,575787523,
-sfx2_PushButton_RID_SFX_TP_MACROASSIGN_PB_DELETE,575787524,
 sfx2_PushButton_RID_STYLECATALOG_BT_DEL,1097683460,
 sfx2_PushButton_RID_STYLECATALOG_BT_EDIT,1097683461,
 sfx2_PushButton_RID_STYLECATALOG_BT_NEW,1097683462,
 sfx2_PushButton_RID_STYLECATALOG_BT_ORG,1097683459,
 sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711,
-sfx2_PushButton_TP_CONFIG_ACCEL_BTN_ACC_CHANGE,575017475,
-sfx2_PushButton_TP_CONFIG_ACCEL_BTN_ACC_REMOVE,575017476,
-sfx2_PushButton_TP_CONFIG_ACCEL_BTN_LOAD,575017512,
-sfx2_PushButton_TP_CONFIG_ACCEL_BTN_RESET,575017492,
-sfx2_PushButton_TP_CONFIG_ACCEL_BTN_SAVE,575017513,
 sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD,541364830,
 sfx2_PushButton_TP_DOCINFODOC_BTN_DELETE,541200958,
 sfx2_PushButton_TP_DOCINFODOC_BTN_SIGNATURE,541200975,
@@ -7898,12 +7939,9 @@ sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCEGRADIENTS_COLOR,576160278,
 sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCEGRADIENTS_STRIPES,576160277,
 sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCETRANSPARENCY_AUTO,576160267,
 sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCETRANSPARENCY_NONE,576160268,
-sfx2_RadioButton_TP_CONFIG_ACCEL_RB_MODULE,575013421,
-sfx2_RadioButton_TP_CONFIG_ACCEL_RB_OFFICE,575013420,
 sfx2_RadioButton_TP_DOCINFORELOAD_RB_FORWARDUPDATE,541344321,
 sfx2_RadioButton_TP_DOCINFORELOAD_RB_NOAUTOUPDATE,541344319,
 sfx2_RadioButton_TP_DOCINFORELOAD_RB_RELOADUPDATE,541344320,
-sfx2_TabPage_RID_SFX_TP_MACROASSIGN,575782912,
 starmath_CheckBox_RID_DISTANCEDIALOG_1,1401504769,
 starmath_CheckBox_RID_FONTDIALOG_1,1401455617,
 starmath_CheckBox_RID_FONTDIALOG_2,1401455618,
@@ -8068,8 +8106,8 @@ svx_CheckBox_OFA_TP_MISC_CB_TOOLTIP,810484747,
 svx_CheckBox_OFA_TP_VIEW_CB_FONTANTIALIASING,810517567,
 svx_CheckBox_OFA_TP_VIEW_CB_FONT_HISTORY,810517566,
 svx_CheckBox_OFA_TP_VIEW_CB_FONT_SHOW,810517564,
-svx_CheckBox_OFA_TP_VIEW_CB_MENU_ICONS,810517544,
-svx_CheckBox_OFA_TP_VIEW_CB_SYSTEM_FONT,810517560,
+svx_CheckBox_OFA_TP_VIEW_CB_SELECTION,810517575,
+svx_CheckBox_OFA_TP_VIEW_CB_SYSTEM_FONT,810517561,
 svx_CheckBox_OFA_TP_VIEW_CB_USE_ANTIALIASE,810517573,
 svx_CheckBox_OFA_TP_VIEW_CB_USE_HARDACCELL,810517572,
 svx_CheckBox_RID_OFADLG_OPTIONS_TREE_HINT_CB_DISABLE,1346012182,
@@ -8077,7 +8115,7 @@ svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_ACTIV,809157753,
 svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_APPEND_SPACE,809157755,
 svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_AS_TIP,809157757,
 svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_COLLECT,809157754,
-svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_KEEP_LIST,809157756,
+svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_REMOVE_LIST,809157756,
 svx_CheckBox_RID_OFAPAGE_AUTOCORR_EXCEPT_CB_AUTOABBREV,808911915,
 svx_CheckBox_RID_OFAPAGE_AUTOCORR_EXCEPT_CB_AUTOCAPS,808911916,
 svx_CheckBox_RID_OFAPAGE_AUTOCORR_QUOTE_CB_TYPO,808993803,
@@ -8492,8 +8530,9 @@ svx_ListBox_OFA_TP_LANGUAGES_LB_LOCALESETTING,810569233,
 svx_ListBox_OFA_TP_LANGUAGES_LB_USERINTERFACE,810569247,
 svx_ListBox_OFA_TP_LANGUAGES_LB_WEST_LANG,810569222,
 svx_ListBox_OFA_TP_MISC_LB_HELPFORMAT,810487312,
-svx_ListBox_OFA_TP_VIEW_LB_ICONSIZE,810520117,
-svx_ListBox_OFA_TP_VIEW_LB_ICONSTYLE,810520119,
+svx_ListBox_OFA_TP_VIEW_LB_ICONSIZE,810520118,
+svx_ListBox_OFA_TP_VIEW_LB_ICONSTYLE,810520120,
+svx_ListBox_OFA_TP_VIEW_LB_MENU_ICONS,810520105,
 svx_ListBox_OFA_TP_VIEW_LB_MOUSEMIDDLE,810520098,
 svx_ListBox_OFA_TP_VIEW_LB_MOUSEPOS,810520095,
 svx_ListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_DCB_EXPAND_KEY,809160323,
@@ -8600,6 +8639,7 @@ svx_ListBox_RID_SVXPAGE_COLOR_LB_COLOR,701697537,
 svx_ListBox_RID_SVXPAGE_COLOR_LB_COLORMODEL,701697538,
 svx_ListBox_RID_SVXPAGE_CONNECTION_LB_TYPE,703843841,
 svx_ListBox_RID_SVXPAGE_DOCRECOVERY_SAVE_LB_SAVE_FILELIST,700845574,
+svx_ListBox_RID_SVXPAGE_EVENTASSIGN_LB_SCRIPTTYPE,705678856,
 svx_ListBox_RID_SVXPAGE_EVENTS_LB_SAVEIN,705547787,
 svx_ListBox_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKPOSITION,700829248,
 svx_ListBox_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKTYPE,700829246,
@@ -8677,6 +8717,7 @@ svx_MetricBox_RID_SVXPAGE_CHAR_NAME_LB_EAST_SIZE,704636532,
 svx_MetricBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_SIZE,704636522,
 svx_MetricBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_SIZE_NOCJK,704636844,
 svx_MetricBox_RID_SVXPAGE_TABULATOR_ED_TABPOS,700753418,
+svx_MetricField_OFA_TP_VIEW_MF_SELECTION,810523208,
 svx_MetricField_OFA_TP_VIEW_MF_WINDOWSIZE,810523158,
 svx_MetricField_RID_OFADLG_PRCNT_SET_ED_RIGHT_MARGIN,1345903204,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_1,3391953410,
@@ -8832,6 +8873,7 @@ svx_MetricField_RID_SVX_MDLG_FONTWORK_CHARSPACING_MF_VALUE,1237899783,
 svx_ModalDialog_DLG_CHINESEDICTIONARY,1078673408,
 svx_ModalDialog_DLG_CHINESETRANSLATION,1078657024,
 svx_ModalDialog_DLG_DOCUMENTLINK,1346109440,
+svx_ModalDialog_DLG_INS_ROW_COL,1240137728,
 svx_ModalDialog_MD_ICONCHANGE,1080606720,
 svx_ModalDialog_MD_INSERT_OBJECT_APPLET,1598177280,
 svx_ModalDialog_MD_INSERT_OBJECT_IFRAME,1598210048,
@@ -8873,6 +8915,7 @@ svx_MultiListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_LB_ENTRIES,809159812,
 svx_MultiListBox_RID_SVXPAGE_NUM_OPTIONS_LB_LEVEL,704302232,
 svx_MultiListBox_RID_SVXPAGE_NUM_POSITION_LB_LEVEL,704318616,
 svx_MultiListBox_RID_SVXTABPAGE_GALLERYTHEME_FILES_LBX_FOUND,706677761,
+svx_NumericField_DLG_INS_ROW_COL_ED_COUNT,1240143874,
 svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINHEIGHT,1598216200,
 svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINWIDTH,1598216202,
 svx_NumericField_OFA_TP_MEMORY_ED_UNDO,811309068,
@@ -9047,6 +9090,8 @@ svx_PushButton_RID_SVXPAGE_ERR_REP_SEND_BTN_ERRSEND_OPT,700895769,
 svx_PushButton_RID_SVXPAGE_ERR_REP_SEND_BTN_ERRSEND_SHOWREP,700895768,
 svx_PushButton_RID_SVXPAGE_ERR_REP_SEND_BTN_RECOV_PREV,700895754,
 svx_PushButton_RID_SVXPAGE_ERR_REP_WELCOME_BTN_RECOV_PREV,700879370,
+svx_PushButton_RID_SVXPAGE_EVENTASSIGN_PB_ASSIGN,705679875,
+svx_PushButton_RID_SVXPAGE_EVENTASSIGN_PB_DELETE,705679876,
 svx_PushButton_RID_SVXPAGE_EVENTS_PB_ASSIGN,705548802,
 svx_PushButton_RID_SVXPAGE_EVENTS_PB_DELETE,705548803,
 svx_PushButton_RID_SVXPAGE_FOOTER_BTN_EXTRAS,701141544,
@@ -9069,6 +9114,11 @@ svx_PushButton_RID_SVXPAGE_INET_SECURITY_PB_SEC_MACROSEC,703992341,
 svx_PushButton_RID_SVXPAGE_INET_SECURITY_PB_SEC_MASTERPASSWORD,703992338,
 svx_PushButton_RID_SVXPAGE_INET_SECURITY_PB_SEC_PROTRECORDS,703992345,
 svx_PushButton_RID_SVXPAGE_INET_SECURITY_PB_SEC_SECURITYOPTIONS,703992332,
+svx_PushButton_RID_SVXPAGE_KEYBOARD_BTN_ACC_CHANGE,705516035,
+svx_PushButton_RID_SVXPAGE_KEYBOARD_BTN_ACC_REMOVE,705516036,
+svx_PushButton_RID_SVXPAGE_KEYBOARD_BTN_LOAD,705516072,
+svx_PushButton_RID_SVXPAGE_KEYBOARD_BTN_RESET,705516052,
+svx_PushButton_RID_SVXPAGE_KEYBOARD_BTN_SAVE,705516073,
 svx_PushButton_RID_SVXPAGE_LINEEND_DEF_BTN_ADD,701583873,
 svx_PushButton_RID_SVXPAGE_LINEEND_DEF_BTN_DELETE,701583875,
 svx_PushButton_RID_SVXPAGE_LINEEND_DEF_BTN_MODIFY,701583874,
@@ -9102,6 +9152,8 @@ svx_PushButton_RID_SVX_MDLG_HANGULHANJA_OPT_PB_HHO_DELETE,1237651971,
 svx_PushButton_RID_SVX_MDLG_HANGULHANJA_OPT_PB_HHO_EDIT,1237651970,
 svx_PushButton_RID_SVX_MDLG_HANGULHANJA_OPT_PB_HHO_NEW,1237651969,
 svx_PushButton_RID_SVX_MDLG_HANGULHANJA_PB_FIND,1237602817,
+svx_RadioButton_DLG_INS_ROW_COL_CB_POS_AFTER,1240138251,
+svx_RadioButton_DLG_INS_ROW_COL_CB_POS_BEFORE,1240138250,
 svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_FRMBORDER_OFF,1598210580,
 svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_FRMBORDER_ON,1598210578,
 svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGAUTO,1598210575,
@@ -9175,6 +9227,8 @@ svx_RadioButton_RID_SVXPAGE_INET_PROXY_RB_DNS_MANUAL,703283819,
 svx_RadioButton_RID_SVXPAGE_INET_SEARCH_RB_AND,703332907,
 svx_RadioButton_RID_SVXPAGE_INET_SEARCH_RB_EXACT,703332909,
 svx_RadioButton_RID_SVXPAGE_INET_SEARCH_RB_OR,703332908,
+svx_RadioButton_RID_SVXPAGE_KEYBOARD_RB_MODULE,705511981,
+svx_RadioButton_RID_SVXPAGE_KEYBOARD_RB_OFFICE,705511980,
 svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYDAY,705593868,
 svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYMONTH,705593870,
 svx_RadioButton_RID_SVXPAGE_ONLINEUPDATE_RB_EVERYWEEK,705593869,
@@ -9215,6 +9269,7 @@ svx_TabPage_RID_OFAPAGE_MSFILTEROPT,809172992,
 svx_TabPage_RID_OFAPAGE_MSFILTEROPT2,809189376,
 svx_TabPage_RID_OFA_TP_INTERNATIONAL,811335680,
 svx_TabPage_RID_SFXPAGE_DBREGISTER,809222144,
+svx_TabPage_RID_SVXPAGE_EVENTASSIGN,705675264,
 svx_TabPage_RID_SVXPAGE_IMPROVEMENT,705658880,
 svx_TabPage_RID_SVXPAGE_INET_MOZPLUGIN,736116736,
 svx_TabPage_RID_SVXPAGE_INET_SECURITY,703987712,
@@ -9883,7 +9938,6 @@ sw_MetricField_TP_TOX_ENTRY_MF_TABPOS,879155764,
 sw_ModalDialog_DLG_CHANGE_DB,1419591680,
 sw_ModalDialog_DLG_DBSELECTION,1435009024,
 sw_ModalDialog_DLG_INS_FOOTNOTE,1428652032,
-sw_ModalDialog_DLG_INS_ROW_COL,1425227776,
 sw_ModalDialog_DLG_JAVAEDIT,1419608064,
 sw_ModalDialog_DLG_MAILMERGEWIZARD,1435058176,
 sw_MoreButton_DLG_AUTOFMT_TABLE_BTN_MORE,1425338984,
@@ -9906,7 +9960,6 @@ sw_NumericField_DLG_INSERT_ABSTRACT_NF_PARA,1404835843,
 sw_NumericField_DLG_INSERT_TABLE_ED_COL,1425184772,
 sw_NumericField_DLG_INSERT_TABLE_ED_ROW,1425184773,
 sw_NumericField_DLG_INSERT_TABLE_NF_REPEAT_HEADER,1425184787,
-sw_NumericField_DLG_INS_ROW_COL_ED_COUNT,1425233922,
 sw_NumericField_DLG_MAILMERGE_NF_FROM,1446615045,
 sw_NumericField_DLG_MAILMERGE_NF_TO,1446615047,
 sw_NumericField_DLG_MM_CREATEADDRESSLIST_NF_SETNO,1435244554,
@@ -10086,8 +10139,6 @@ sw_RadioButton_DLG_INS_FOOTNOTE_RB_NUMBER_AUTO,1428652545,
 sw_RadioButton_DLG_INS_FOOTNOTE_RB_NUMBER_CHAR,1428652546,
 sw_RadioButton_DLG_INS_FOOTNOTE_RB_TYPE_ENDNOTE,1428652552,
 sw_RadioButton_DLG_INS_FOOTNOTE_RB_TYPE_FTN,1428652551,
-sw_RadioButton_DLG_INS_ROW_COL_CB_POS_AFTER,1425228299,
-sw_RadioButton_DLG_INS_ROW_COL_CB_POS_BEFORE,1425228298,
 sw_RadioButton_DLG_JAVAEDIT_RB_EDIT,1419608588,
 sw_RadioButton_DLG_JAVAEDIT_RB_URL,1419608595,
 sw_RadioButton_DLG_MAILMERGE_RB_ALL,1446609410,
@@ -10265,6 +10316,7 @@ FN_STAT_HYPERLINKS,,.uno:ExecHyperlinks
 FontHeight,,.uno:
 SID_ACTIONMODE,,.uno:ActionMode
 SID_AUTOSPELL_MARKOFF,,.uno:HideSpellMark
+SID_BULLET,,.uno:Bullet
 SID_FILL_DRAFT,,.uno:FillDraft
 SID_FONTWORK_SHAPE_TYPES,,.uno:FontworkShapeTypes
 SID_GRAPHIC_DRAFT,,.uno:GraphicDraft
diff --git a/helpcontent2/helpers/hid.lst b/helpcontent2/helpers/hid.lst
index b70be89278..1a64515e73 100644
--- a/helpcontent2/helpers/hid.lst
+++ b/helpcontent2/helpers/hid.lst
@@ -1,4 +1,4 @@
-DEV300.m53 010101010101010
+DEV300.m52 010101010101010
 
 0 0
 1 1
@@ -346,6 +346,7 @@ FN_PAGEUP 20937
 FN_PAGEUP_SEL 20829
 FN_PASTESPECIAL 20114
 FN_POSTIT 20329
+FN_PREVIEW_PRINT_OPTIONS 20250
 FN_PREVIEW_ZOOM 20251
 FN_PREV_BOOKMARK 20169
 FN_PREV_FOOTNOTE 20957
@@ -500,6 +501,7 @@ FN_XFORMS_DESIGN_MODE 22300
 FN_XFORMS_INIT 21053
 FontWork1TBO 40026
 FontWork2TBO 40027
+HDE_PDF_EXPORT_DLG 33375
 HID0_CANCEL 34205
 HID0_CREATE 34204
 HID0_HELP 34201
@@ -6951,7 +6953,7 @@ sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_FILTER 2567504925
 sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_IGNEMPTYROWS 2567504921 
 sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALCOL 2567504923 
 sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALROW 2567504924 
-sc:CheckBox:RID_SCDLG_RETYPEPASS_INPUT:BTN_MATCH_OLD_PASSWORD 1495680305 
+sc:CheckBox:RID_SCDLG_RETYPEPASS_INPUT:BTN_MATCH_OLD_PASSWORD 1495663921 
 sc:CheckBox:RID_SCDLG_ROW_MAN:BTN_DEFVAL 1494942721 
 sc:CheckBox:RID_SCDLG_ROW_OPT:BTN_DEFVAL 1494959105 
 sc:CheckBox:RID_SCDLG_SHAREDOCUMENT:CB_SHARE 1495598081 
@@ -6961,7 +6963,7 @@ sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_DEST_PERS 2567095308
 sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_HEADER 2567095300 
 sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_REGEXP 2567095299 
 sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_UNIQUE 2567095297 
-sc:CheckBox:RID_SCDLG_TABPROTECTION:BTN_PROTECT 1495630852 
+sc:CheckBox:RID_SCDLG_TABPROTECTION:BTN_PROTECT 1495614468 
 sc:CheckBox:RID_SCPAGE_CALC:BTN_CALC 957252625 
 sc:CheckBox:RID_SCPAGE_CALC:BTN_CASE 957252623 
 sc:CheckBox:RID_SCPAGE_CALC:BTN_ITERATE 957252609 
@@ -7077,8 +7079,8 @@ sc:Edit:RID_SCDLG_OPTSOLVER:ED_TARGET 2569209858
 sc:Edit:RID_SCDLG_OPTSOLVER:ED_VARIABLECELLS 2569209859 
 sc:Edit:RID_SCDLG_PIVOT_LAYOUT:ED_INAREA 2567505962 
 sc:Edit:RID_SCDLG_PIVOT_LAYOUT:ED_OUTAREA 2567505943 
-sc:Edit:RID_SCDLG_RETYPEPASS_INPUT:ED_PASSWORD1 1495681326 
-sc:Edit:RID_SCDLG_RETYPEPASS_INPUT:ED_PASSWORD2 1495681328 
+sc:Edit:RID_SCDLG_RETYPEPASS_INPUT:ED_PASSWORD1 1495664942 
+sc:Edit:RID_SCDLG_RETYPEPASS_INPUT:ED_PASSWORD2 1495664944 
 sc:Edit:RID_SCDLG_SIMPLEREF:ED_ASSIGN 2568996875 
 sc:Edit:RID_SCDLG_SOLVER:ED_FORMULACELL 2567374849 
 sc:Edit:RID_SCDLG_SOLVER:ED_TARGETVAL 2567374850 
@@ -7090,8 +7092,8 @@ sc:Edit:RID_SCDLG_STRINPUT:ED_INPUT 1493469194
 sc:Edit:RID_SCDLG_TABOP:ED_COLCELL 2567899139 
 sc:Edit:RID_SCDLG_TABOP:ED_FORMULARANGE 2567899137 
 sc:Edit:RID_SCDLG_TABOP:ED_ROWCELL 2567899138 
-sc:Edit:RID_SCDLG_TABPROTECTION:ED_PASSWORD1 1495631878 
-sc:Edit:RID_SCDLG_TABPROTECTION:ED_PASSWORD2 1495631880 
+sc:Edit:RID_SCDLG_TABPROTECTION:ED_PASSWORD1 1495615494 
+sc:Edit:RID_SCDLG_TABPROTECTION:ED_PASSWORD2 1495615496 
 sc:Edit:RID_SCPAGE_CALC:ED_EPS 957253637 
 sc:Edit:RID_SCPAGE_SORT_OPTIONS:ED_OUTAREA 956450820 
 sc:Edit:RID_SCPAGE_USERLISTS:ED_COPYFROM 956844035 
@@ -7249,11 +7251,10 @@ sc:ModalDialog:RID_SCDLG_GROUP 1493549056
 sc:ModalDialog:RID_SCDLG_INSERT_TABLE 1493893120 
 sc:ModalDialog:RID_SCDLG_LINKAREA 1495367680 
 sc:ModalDialog:RID_SCDLG_NEWSCENARIO 1493843968 
-sc:ModalDialog:RID_SCDLG_RETYPEPASS 1495662592 
-sc:ModalDialog:RID_SCDLG_RETYPEPASS_INPUT 1495678976 
-sc:ModalDialog:RID_SCDLG_SORT_WARNING 1495613440 
+sc:ModalDialog:RID_SCDLG_RETYPEPASS 1495646208 
+sc:ModalDialog:RID_SCDLG_RETYPEPASS_INPUT 1495662592 
 sc:ModalDialog:RID_SCDLG_STRINPUT 1493467136 
-sc:ModalDialog:RID_SCDLG_TABPROTECTION 1495629824 
+sc:ModalDialog:RID_SCDLG_TABPROTECTION 1495613440 
 sc:ModelessDialog:RID_SCDLG_SIMPLEREF 2568994816 
 sc:MoreButton:RID_SCDLG_AUTOFORMAT:BTN_MORE 1493545576 
 sc:MoreButton:RID_SCDLG_CONSOLIDATE:BTN_MORE 2567533060 
@@ -7312,11 +7313,11 @@ sc:PushButton:RID_SCDLG_OPTSOLVER:BTN_SOLVE 2569212420
 sc:PushButton:RID_SCDLG_PIVOTSUBT:BTN_OPTIONS 1493832197 
 sc:PushButton:RID_SCDLG_PIVOT_LAYOUT:BTN_OPTIONS 2567508486 
 sc:PushButton:RID_SCDLG_PIVOT_LAYOUT:BTN_REMOVE 2567508485 
-sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_DOC 1495667213 
-sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET1 1495667315 
-sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET2 1495667318 
-sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET3 1495667321 
-sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET4 1495667324 
+sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_DOC 1495650829 
+sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET1 1495650931 
+sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET2 1495650934 
+sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET3 1495650937 
+sc:PushButton:RID_SCDLG_RETYPEPASS:BTN_RETYPE_SHEET4 1495650940 
 sc:PushButton:RID_SCDLG_SOLVEROPTIONS:BTN_EDIT 1495486977 
 sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_CURSORT 1495618052 
 sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_EXTSORT 1495618051 
@@ -7385,8 +7386,8 @@ sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_VALUE 2569208323
 sc:RadioButton:RID_SCDLG_PIVOTSUBT:RB_AUTO 1493828098 
 sc:RadioButton:RID_SCDLG_PIVOTSUBT:RB_NONE 1493828097 
 sc:RadioButton:RID_SCDLG_PIVOTSUBT:RB_USER 1493828099 
-sc:RadioButton:RID_SCDLG_RETYPEPASS_INPUT:BTN_REMOVE_PASSWORD 1495679795 
-sc:RadioButton:RID_SCDLG_RETYPEPASS_INPUT:BTN_RETYPE_PASSWORD 1495679794 
+sc:RadioButton:RID_SCDLG_RETYPEPASS_INPUT:BTN_REMOVE_PASSWORD 1495663411 
+sc:RadioButton:RID_SCDLG_RETYPEPASS_INPUT:BTN_RETYPE_PASSWORD 1495663410 
 sc:RadioButton:RID_SCPAGE_CALC:BTN_DATE1904 957252107 
 sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESC10 957252106 
 sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESTD 957252105 
diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl
index ae7dddf0d6..71579750ad 100644
--- a/helpcontent2/helpers/update_tree.pl
+++ b/helpcontent2/helpers/update_tree.pl
@@ -71,6 +71,8 @@ if ( ! defined $prj ) {
     ($tree_src = $scriptname) =~ s/\/update_tree.pl/\/..\/source\/auxiliary/;
     ($tree_dest = $scriptname) =~ s/\/update_tree.pl/\/..\/$destpath\/misc/;
     ($source_dir = $scriptname) =~ s/\/update_tree.pl/\/..\/source/;
+    ($source_dir_xhp = $scriptname) =~ s/\/update_tree.pl/\/..\/source/;
+
     if ( defined $ENV{TRYSDF} && defined $ENV{LOCALIZESDF} )
     {
         if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" )
@@ -93,6 +95,7 @@ if ( ! defined $prj ) {
     $tree_src = "$prj\/source\/auxiliary";
     $tree_dest = "$prj\/$destpath\/misc";
     $source_dir = "$prj\/source";
+    $source_dir_xhp = "$prj\/source";
     $treestrings = "$source_dir/text/shared/tree_strings.xhp";
 
     if ( defined $ENV{TRYSDF} && defined $ENV{LOCALIZESDF} )
@@ -238,7 +241,7 @@ sub processtreefiles {
                 ($id = $l) =~ s/^.*id="([^"]*)".*$/$1/gis;
                 ($module = $id) =~ s/^([^\/]*).*$/$1/;
                 $id =~ s/^.*?\///;
-                $file = "$source_dir/$id";
+                $file = "$source_dir_xhp/$id";
 
                 if ($lng eq 'en-US') { # english comes from the file
                     if (open F,$file) {