rebase to DEV300_m69

2 files changed, 178 insertions, 63 deletions

diff --git a/helpcontent2/helpers/hid.lst b/helpcontent2/helpers/hid.lst
index 1a64515e73..fb235c12d1 100644
--- a/helpcontent2/helpers/hid.lst
+++ b/helpcontent2/helpers/hid.lst
@@ -1,6 +1,5 @@
-DEV300.m52 010101010101010
+DEV300.m61 010101010101010
 
-0 0
 1 1
 DLG_INSERT_PAGES_OBJS 938
 DLG_JOIN_TABADD 19214
@@ -58,7 +57,6 @@ FID_MERGE_TOGGLE 26581
 FID_NORMALVIEWMODE 26249
 FID_NOTE_VISIBLE 26630
 FID_PAGEBREAKMODE 26247
-FID_PASTE_CONTENTS 26220
 FID_PROTECT_DOC 26307
 FID_PROTECT_TABLE 26306
 FID_RECALC 26304
@@ -344,7 +342,6 @@ FN_PAGEDOWN 20938
 FN_PAGEDOWN_SEL 20830
 FN_PAGEUP 20937
 FN_PAGEUP_SEL 20829
-FN_PASTESPECIAL 20114
 FN_POSTIT 20329
 FN_PREVIEW_PRINT_OPTIONS 20250
 FN_PREVIEW_ZOOM 20251
@@ -501,7 +498,6 @@ 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
@@ -1860,7 +1856,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
@@ -2909,6 +2909,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
@@ -2990,63 +2991,178 @@ HID_PRINTDLG 32868
 HID_PRINTMONITOR 33072
 HID_PRINT_AS_MERGE 54949
 HID_PRINT_OPTIONS 33124
+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
 HID_PROP_BINDING_NAME 38019
 HID_PROP_BIND_EXPRESSION 37998
 HID_PROP_BLOCKINCREMENT 37892
+HID_PROP_BORDER 37815
 HID_PROP_BORDERCOLOR 38105
+HID_PROP_BOUNDCOLUMN 37801
 HID_PROP_BOUND_CELL 37900
+HID_PROP_BUTTONTYPE 37823
 HID_PROP_CELL_EXCHANGE_TYPE 37902
+HID_PROP_CLASSID 37796
+HID_PROP_CONTROLLABEL 37879
+HID_PROP_CONTROLSOURCE 37771
+HID_PROP_CURRENCYSYMBOL 37844
+HID_PROP_CURRSYM_POSITION 37880
+HID_PROP_CURSORSOURCE 37777
+HID_PROP_CURSORSOURCETYPE 37778
+HID_PROP_CURSORTYPE 37779
+HID_PROP_CYCLE 37783
+HID_PROP_DATAENTRY 37781
+HID_PROP_DATASOURCE 37776
+HID_PROP_DATE 37833
+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_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_FOCUSONCLICK 38102
+HID_PROP_FONT 37809
+HID_PROP_FORMATKEY 37791
+HID_PROP_GROUPBOX 37770
+HID_PROP_HEIGHT 37799
+HID_PROP_HELPTEXT 37872
+HID_PROP_HELPURL 37873
+HID_PROP_HIDDEN_VALUE 37864
 HID_PROP_HIDEINACTIVESELECTION 38103
+HID_PROP_HSCROLL 37819
 HID_PROP_ICONSIZE 37927
 HID_PROP_IMAGEPOSITION 38107
+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
+HID_PROP_LINECOUNT 37849
 HID_PROP_LINEEND_FORMAT 37934
 HID_PROP_LINEINCREMENT 37891
+HID_PROP_LISTINDEX 37804
+HID_PROP_LISTSOURCE 37803
+HID_PROP_LISTSOURCETYPE 37802
 HID_PROP_LIST_BINDING 38018
 HID_PROP_LIST_CELL_RANGE 37901
+HID_PROP_LITERALMASK 37846
+HID_PROP_LOCKED 37790
+HID_PROP_MASTERFIELDS 37774
+HID_PROP_MAXTEXTLEN 37850
+HID_PROP_MULTILINE 37818
+HID_PROP_MULTISELECTION 37832
+HID_PROP_NAME 37772
+HID_PROP_NAVIGATION 37782
+HID_PROP_NAVIGATIONBAR 37866
 HID_PROP_NOLABEL 38108
+HID_PROP_OLDVALUE 37788
 HID_PROP_ORIENTATION 37894
 HID_PROP_POSITIONX 37895
 HID_PROP_POSITIONY 37896
+HID_PROP_PRINTABLE 37855
 HID_PROP_PROGRESSVALUE 37886
 HID_PROP_PROGRESSVALUE_MAX 37888
 HID_PROP_PROGRESSVALUE_MIN 37887
 HID_PROP_PUSHBUTTONTYPE 37897
+HID_PROP_READONLY 37780
+HID_PROP_RECORDMARKER 37874
+HID_PROP_REFVALUE 37822
 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_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_SLAVEFIELDS 37775
+HID_PROP_SORT_CRITERIA 37868
+HID_PROP_SPIN 37851
 HID_PROP_SPININCREMENT 37912
 HID_PROP_SPINVALUE 37908
 HID_PROP_SPINVALUE_MAX 37910
 HID_PROP_SPINVALUE_MIN 37909
 HID_PROP_STATE 37898
 HID_PROP_STEP 37884
+HID_PROP_STRICTFORMAT 37852
+HID_PROP_STRINGITEMLIST 37807
 HID_PROP_SUBMISSION_ID 37942
+HID_PROP_SUBMIT_ACTION 37824
+HID_PROP_SUBMIT_ENCODING 37826
+HID_PROP_SUBMIT_METHOD 37825
+HID_PROP_SUBMIT_TARGET 37828
 HID_PROP_SYMBOLCOLOR 37907
+HID_PROP_TABINDEX 37773
 HID_PROP_TABORDER_CONTROLS 37916
+HID_PROP_TABSTOP 37821
+HID_PROP_TAG 37858
+HID_PROP_TARGET_FRAME 37857
+HID_PROP_TARGET_URL 37856
+HID_PROP_TEXT 37805
 HID_PROP_TEXTTYPE 37933
+HID_PROP_TIME 37837
+HID_PROP_TIMEFORMAT 37840
+HID_PROP_TIMEMAX 37839
+HID_PROP_TIMEMIN 37838
 HID_PROP_TITLE 37883
 HID_PROP_TOGGLE 38101
+HID_PROP_TRISTATE 37865
 HID_PROP_UNCHECKEDREFVALUE 37941
+HID_PROP_UNIQUE 37795
 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
 HID_PROP_XML_DATA_MODEL 37997
@@ -3067,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
@@ -3536,6 +3653,7 @@ HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES 59925
 HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL 59926
 HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY 59927
 HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW 59928
+HID_SD_ANNOTATIONS 59969
 HID_SD_AUTOPILOT_OPEN 59887
 HID_SD_AUTOPILOT_PAGE1 59771
 HID_SD_AUTOPILOT_PAGE2 59772
@@ -4235,7 +4353,6 @@ HID_XFORMS_ADDSUBMISSION_DLG 38133
 HID_XFORMS_INSTANCES_MENUBTN 38132
 HID_XFORMS_ITEMS_LIST 38129
 HID_XFORMS_MANAGENAMESPACE_DLG 38112
-HID_XFORMS_MID_INSERT_CONTROL 38136
 HID_XFORMS_MODELS_LIST 38130
 HID_XFORMS_MODELS_MENUBTN 38131
 HID_XFORMS_NAMESPACEITEM_DLG 38110
@@ -4319,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
@@ -4661,7 +4776,7 @@ SID_CLEARHISTORY 5703
 SID_CLEARMEMCACHE 6316
 SID_CLEAR_UNDO_STACK 27115
 SID_CLICK_CHANGE_ROTATION 27170
-SID_CLIPBOARD_FORMAT_ITEMS 10922
+SID_CLIPBOARD_FORMAT_ITEMS 5312
 SID_CLOSEDOC 5503
 SID_CLOSEDOCS 5595
 SID_CLOSEWIN 5621
@@ -4737,11 +4852,9 @@ SID_CREATE_BASICOBJECT 6555
 SID_CREATE_SW_DRAWVIEW 10860
 SID_CTLFONT_STATE 10956
 SID_CURRENTCELL 26041
-SID_CURRENTDATE 5312
 SID_CURRENTDOC 26043
 SID_CURRENTOBJECT 26044
 SID_CURRENTTAB 26042
-SID_CURRENTTIME 5311
 SID_CURRENT_URL 6613
 SID_CURSORBLKDOWN 26536
 SID_CURSORBLKDOWN_SEL 26540
@@ -4844,6 +4957,8 @@ SID_DEFINE_COLROWNAMERANGES 26629
 SID_DEFINE_DBNAME 26320
 SID_DEFINE_PRINTAREA 26602
 SID_DELETE 5713
+SID_DELETEALLBYAUTHOR_POSTIT 11100
+SID_DELETEALL_POSTIT 11097
 SID_DELETE_BASICOBJECT 6556
 SID_DELETE_CONTENTS 26553
 SID_DELETE_FRAME 5652
@@ -4851,6 +4966,7 @@ SID_DELETE_LAYER 27081
 SID_DELETE_MASTER_PAGE 27432
 SID_DELETE_NOTE 26478
 SID_DELETE_PAGE 27080
+SID_DELETE_POSTIT 11094
 SID_DELETE_PRINTAREA 26603
 SID_DELETE_SCENARIO 26666
 SID_DELETE_SNAPITEM 27108
@@ -5210,9 +5326,6 @@ SID_GETLINEWIDTH 27273
 SID_GETRED 27259
 SID_GETREDOSTRINGS 10924
 SID_GETUNDOSTRINGS 10923
-SID_GET_CLPBRD_FORMAT_BY_IDX 26669
-SID_GET_CLPBRD_FORMAT_COUNT 26668
-SID_GET_CLPBRD_FORMAT_NAME 26670
 SID_GET_COLORTABLE 10441
 SID_GLUE_EDITMODE 27301
 SID_GLUE_ESCDIR 27304
@@ -5290,6 +5403,7 @@ SID_IMAP 10371
 SID_IMAP_EXEC 10374
 SID_IMG_LOADING 5586
 SID_IMPORT_DATA 26335
+SID_IMPORT_DIALOG 5966
 SID_INC_INDENT 10462
 SID_INDEXDESIGN 12251
 SID_INET_DLG 10416
@@ -5347,7 +5461,7 @@ SID_INSERT_OBJECT 5561
 SID_INSERT_PAGE_NUMBER 27411
 SID_INSERT_PATTERNFIELD 10941
 SID_INSERT_PLUGIN 5672
-SID_INSERT_POSTIT 26276
+SID_INSERT_POSTIT 11101
 SID_INSERT_PREVIEW 10196
 SID_INSERT_PROGRESSBAR 10927
 SID_INSERT_PUSHBUTTON 10146
@@ -5448,6 +5562,7 @@ SID_NEWWINDOW 5620
 SID_NEXTERR 30257
 SID_NEXTMARK 30259
 SID_NEXT_MARK 12611
+SID_NEXT_POSTIT 11095
 SID_NEXT_TABLE 26543
 SID_NEXT_TABLE_SEL 26561
 SID_NEXT_UNPROTECT 26545
@@ -5487,8 +5602,7 @@ SID_OBJECT_HEAVEN 10283
 SID_OBJECT_HEIGHT 26659
 SID_OBJECT_HELL 10282
 SID_OBJECT_LEFT 26656
-SID_OBJECT_MIRROR 26386
-SID_OBJECT_MIRROR 27085
+SID_OBJECT_MIRROR 11093
 SID_OBJECT_RESIZING 12599
 SID_OBJECT_ROTATE 10129
 SID_OBJECT_SELECT 10128
@@ -5571,8 +5685,8 @@ SID_PARA_DLG 10297
 SID_PARA_VERTALIGN 10925
 SID_PARTWIN 6640
 SID_PASTE 5712
-SID_PASTE2 27003
 SID_PASTEOBJECT 30374
+SID_PASTE_SPECIAL 5311
 SID_PASTE_UNFORMATTED 5314
 SID_PICKLIST 5510
 SID_PICK_THROUGH 27159
@@ -5608,6 +5722,7 @@ SID_PREVIEW_STATE 27329
 SID_PREVIEW_WIN 27327
 SID_PREVIEW_ZOOMIN 26501
 SID_PREVIEW_ZOOMOUT 26502
+SID_PREVIOUS_POSTIT 11096
 SID_PREVMARK 30260
 SID_PREV_MARK 12612
 SID_PREV_TABLE 26544
@@ -5657,6 +5772,7 @@ SID_RENAME_MASTER_PAGE 27433
 SID_RENAME_OBJECT 26088
 SID_REPAINT 26012
 SID_REPEAT 5702
+SID_REPLYTO_POSTIT 11099
 SID_REPORTHEADERFOOTER 12453
 SID_REPORT_CREATE_REPWIZ_PRE_SEL 12302
 SID_RESTORE_EDITING_VIEW 6663
@@ -5757,6 +5873,7 @@ SID_SHOWPOPUPS 5929
 SID_SHOW_BROWSER 10163
 SID_SHOW_IME_STATUS_WINDOW 6680
 SID_SHOW_ITEMBROWSER 11001
+SID_SHOW_POSTIT 11098
 SID_SHOW_PROPERTYBROWSER 10943
 SID_SHOW_SLIDE 27440
 SID_SHRINK_FONT_SIZE 11043
@@ -5843,7 +5960,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
@@ -6342,6 +6461,7 @@ dbaccess:Edit:PAGE_ORACLE_JDBC:ET_JDBCDRIVERCLASS 851888132
 dbaccess:Edit:PAGE_USERDRIVER:ET_HOSTNAME 851757061 
 dbaccess:Edit:PAGE_USERDRIVER:ET_OPTIONS 851757059 
 dbaccess:Edit:TAB_WIZ_COPYTABLE:ET_KEYNAME 851642371 
+dbaccess:FL_SEPARATOR2:PAGE_MYSQL_NATIVE 851836928 
 dbaccess:FT_JDBCDRIVERCLASS:PAGE_MYSQL_JDBC 851771392 
 dbaccess:FT_JDBCDRIVERCLASS:PAGE_ORACLE_JDBC 851886080 
 dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_NEWFOLDER 1388768769 
@@ -6418,7 +6538,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 
@@ -6461,17 +6580,12 @@ desktop:MultiLineEdit:RID_DLG_LICENSE:ML_LICENSE 1180240435
 desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS 1106676231 
 desktop:MultiLineEdit:RID_DLG_UPDATEINSTALL:RID_DLG_UPDATE_INSTALL_INFO 1106840076 
 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:RID_DLG_UPDATE_OK 1106678282 
+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:TP_LICENSE:PB_LICENSE_DOWN 586142215 
 desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_LATER 586088966 
 desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NEVER 586088967 
@@ -6953,7 +7067,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 1495663921 
+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 
@@ -6963,7 +7077,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 1495614468 
+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 
@@ -7079,8 +7193,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 1495664942 
-sc:Edit:RID_SCDLG_RETYPEPASS_INPUT:ED_PASSWORD2 1495664944 
+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:ED_FORMULACELL 2567374849 
 sc:Edit:RID_SCDLG_SOLVER:ED_TARGETVAL 2567374850 
@@ -7092,8 +7206,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 1495615494 
-sc:Edit:RID_SCDLG_TABPROTECTION:ED_PASSWORD2 1495615496 
+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 
@@ -7251,10 +7365,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 1495646208 
-sc:ModalDialog:RID_SCDLG_RETYPEPASS_INPUT 1495662592 
+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 1495613440 
+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 
@@ -7313,11 +7428,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 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_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 
@@ -7386,8 +7501,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 1495663411 
-sc:RadioButton:RID_SCDLG_RETYPEPASS_INPUT:BTN_RETYPE_PASSWORD 1495663410 
+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 
@@ -7995,6 +8110,7 @@ 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_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 
@@ -8003,7 +8119,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 
@@ -8147,7 +8263,7 @@ svx:CheckBox:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO 701547544
 svx:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE 701563905 
 svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED 701383705 
 svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND 701383706 
-svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT 701383715 
+svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT 701383714 
 svx:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO 704300209 
 svx:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL 704300220 
 svx:CheckBox:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE 704316601 
@@ -8605,6 +8721,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 
@@ -8760,6 +8877,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 
@@ -8801,6 +8919,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 
@@ -9037,6 +9156,8 @@ svx:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW 1237668353
 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: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 
@@ -9821,7 +9942,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 
@@ -9844,7 +9964,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 
@@ -10024,8 +10143,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 
@@ -10154,6 +10271,7 @@ tab:PushButton:DLG_WILL_EXPIRE:PB_EXPIRE_PURCHASE 1082036739
 tab:PushButton:TP_LICENSE:PB_LICENSE_DOWN 545182215 
 tab:PushButton:TP_PURCHASE:PB_PURCHASE_GET 545116676 
 uui:CheckBox:DLG_UUI_LOGIN:CB_LOGIN_SAVEPASSWORD 1311343648 
+uui:CheckBox:DLG_UUI_LOGIN:CB_LOGIN_USESYSCREDS 1311343650 
 uui:CheckBox:RID_XMLSECDLG_MACROWARN:CB_ALWAYSTRUST 1311802374 
 uui:Edit:DLG_UUI_LOGIN:ED_LOGIN_ACCOUNT 1311344671 
 uui:Edit:DLG_UUI_LOGIN:ED_LOGIN_PASSWORD 1311344669 
@@ -10173,7 +10291,7 @@ uui:PushButton:DLG_UUI_SSLWARN:PB_OK 1311773188
 uui:PushButton:DLG_UUI_SSLWARN:PB_VIEW__CERTIFICATE 1311773189 
 uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_OK 1311740418 
 uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_VIEW__CERTIFICATE 1311740419 
-uui:PushButton:RID_DLG_NEWER_VERSION_WARNING:PB_UPDATE 1311904269 
+uui:PushButton:RID_DLG_NEWER_VERSION_WARNING:PB_UPDATE 1312182797 
 uui:PushButton:RID_XMLSECDLG_MACROWARN:PB_VIEWSIGNS 1311805956 
 uui:RadioButton:DLG_COOKIES:RB_INFUTURE_IGNORE 1311359509 
 uui:RadioButton:DLG_COOKIES:RB_INFUTURE_INTERACTIVE 1311359510 
diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl
index 71579750ad..23795168c1 100644
--- a/helpcontent2/helpers/update_tree.pl
+++ b/helpcontent2/helpers/update_tree.pl
@@ -73,7 +73,7 @@ if ( ! defined $prj ) {
     ($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{TRYSDF} || defined $ENV{LOCALIZESDF} )
     {
         if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" )
         {
@@ -98,19 +98,16 @@ if ( ! defined $prj ) {
     $source_dir_xhp = "$prj\/source";
     $treestrings = "$source_dir/text/shared/tree_strings.xhp";
 
-    if ( defined $ENV{TRYSDF} && defined $ENV{LOCALIZESDF} )
+    if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" )
     {
-        if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" )
-        {
-            $source_dir = $ENV{TRYSDF};
-        }
-        else 
-        {
-            $source_dir = $ENV{LOCALIZESDF};
-        }
-        if( $is_win eq "false" ) { $source_dir =~ s/\/auxiliary\/localize.sdf$// ; }
-        else { $source_dir =~ s/\\auxiliary\\localize.sdf$// ; }
+        $source_dir = $ENV{TRYSDF};
+    }
+    else 
+    {
+        $source_dir = $ENV{LOCALIZESDF};
     }
+    if( $is_win eq "false" ) { $source_dir =~ s/\/auxiliary\/localize.sdf$// ; }
+    else { $source_dir =~ s/\\auxiliary\\localize.sdf$// ; }
     #else {die "ERROR: The env variables TRYSDF LOCALIZATION_FOUND LOCALIZESDF not found ... something is wrong!\n";}
 
 }