merge with m61

1 files changed, 19 insertions, 18 deletions

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