dba33a: summary migration from SVN

2009-11-06 13:10:39 +0000 msc  r277387 : minor fix for automatic test
2009-11-06 13:09:33 +0000 msc  r277385 : minor fix for automatic test
2009-11-06 12:30:57 +0000 fs  r277383 : argh. On some virtual machines, waiting 5 seconds for the event to arrive is not enough. Increasing the timeout ...
2009-11-06 12:13:34 +0000 fs  r277382 : this diagnostic code should not have slipped in
2009-11-05 13:21:06 +0000 fs  r277369 : SHL2NOCHECK=TRUE (requested by hjs)
2009-11-04 14:09:46 +0000 msc  r277355 : minor fix for automatic testing
2009-11-04 13:23:02 +0000 msc  r277352 : minor fix for automatic testing
2009-11-04 10:53:28 +0000 msc  r277341 : minor fix for automated testscript
2009-11-04 08:30:58 +0000 msc  r277333 : minor fix for automatic test
2009-11-04 08:15:43 +0000 msc  r277332 : minor fix for automatic test
2009-11-03 14:25:44 +0000 fs  r277324 : #i10000#
2009-11-03 09:47:47 +0000 fs  r277315 : found yet another help ID zombie ... moved formhelpid.hrc content to propctrlr.hrc, where it belongs
2009-11-03 08:50:24 +0000 fs  r277312 : use createTempFileURL, which cares for some more specialities ...
2009-11-03 08:44:55 +0000 fs  r277311 : when creating a temp file for purpose of getting a temp file URL, the delete the file immediately. On some machines/JVMs, the file exists, with write access denied, which isn't Good (TM)
2009-10-22 13:06:17 +0000 fs  r277126 : removed wrong assertion
2009-10-21 08:10:35 +0000 fs  r277077 : reverted the previous change, which was nonsense
2009-10-21 07:19:43 +0000 fs  r277076 : export the component_foo functions, now that some of the objects are built with VISIBILITY_HIDDEN=TRUE
2009-10-21 07:08:35 +0000 fs  r277075 : spare useless call
2009-10-20 21:26:31 +0000 fs  r277072 : #i10000#
2009-10-20 08:06:04 +0000 fs  r277039 : CWS-TOOLING: rebase CWS dba33a to trunk@277035 (milestone: DEV300:m62)
2009-10-16 09:55:25 +0000 fs  r276960 : remove one of the superfluous implts_doLayout calls introduced with the previous patch
2009-10-15 13:18:52 +0000 fs  r276941 : removed the basic tests. According to cn, they're not used anymore (for a long time), and according to 'du -h', they take up 6.0M on my hard disc. For too much for useless code, /me thinks.
2009-10-15 13:06:51 +0000 fs  r276940 : #i10000# remove useless include (otherwise the compiler warning it provokes would need to be fixed by declaring VISIBILITY_HIDDEN=TRUE in the makefile.mk)
2009-10-15 12:52:39 +0000 fs  r276939 : #i10000#
2009-10-15 12:44:26 +0000 fs  r276938 : #i10000#
2009-10-15 12:00:33 +0000 fs  r276936 : #i10000#
2009-10-15 10:31:37 +0000 fs  r276934 : #i105259# prepare for the Hidden arg
2009-10-15 10:31:05 +0000 fs  r276933 : IsMaximized -> const
2009-10-15 09:50:15 +0000 fs  r276932 : during #i105259#:
introduce an option to the layout manager to preserve, if possible, the size of the content window
when layouting. Enable this option for embedded (SFX-based) documents opened for outplace editing.
(the option is incompatible with in-place editing, anyway)
This is because such embedded objects couple the (content) window size to the VisAreaSize, in that
both are used interchangeably. When an embedded object is closed, it remembers the VisAreaSize,
and restores it upon next open. This, however, leads to different content window sizes when the
window is closed with another toolbar set than used during opening.
This patch here prevents those different content window sizes. Also, now the content window size
doesn't change when, explicitly or implicitly, a toolbar is shown or hidden. Instead, the content
window size stays the same, and the container window size is adjusted.
2009-10-15 09:32:41 +0000 fs  r276931 : during #i105259#: UNO access to more attributes of top windows
2009-10-15 09:30:28 +0000 fs  r276930 : indention corrected (better readable)
2009-10-15 09:26:46 +0000 fs  r276929 : during #i105259#: access to more attributes of top windows
2009-10-14 10:04:39 +0000 fs  r276889 : connecting via services manager, not naming service
2009-10-12 11:31:08 +0000 fs  r276831 : during #i105806# FillPropertySet: do not attempt to set *AutoStyleName if it doesn't exist
2009-10-12 11:24:44 +0000 fs  r276830 : #i105806# getPropertyValue: throw an UnknownPropertyException for, well, unknown properties
2009-10-08 08:20:58 +0000 fs  r276774 : implSubmit: re-throw WrappedTargetExceptions unmodified
2009-10-07 19:19:42 +0000 fs  r276770 : #i105198# do not pass an CommandType if we do not have a command
2009-10-07 17:39:36 +0000 fs  r276768 : export the OWeakObject::disposeWeakConnectionPoint symbol
2009-10-07 12:59:17 +0000 fs  r276754 : #i87693#
2009-10-07 11:19:22 +0000 fs  r276752 : #i10000#
2009-10-07 10:21:08 +0000 fs  r276748 : #105482# do not require a controller, at least not in *all* circumstances (executed reports have a model, the ReportDefinition, but no Controller)
2009-10-07 10:04:08 +0000 fs  r276747 : copying the changes from CWS fwk121 herein, in particular the fix for
issue #i105371#
2009-10-07 09:58:30 +0000 fs  r276746 : copying the changes from CWS fwk121 herein, in particular the fix for
issue #i105371#
2009-10-07 09:48:14 +0000 fs  r276744 : removed (now) pointless assertion
2009-10-07 06:59:19 +0000 fs  r276740 : export the OWeakObject::disposeWeakConnectionPoint symbol
2009-10-07 06:44:43 +0000 fs  r276739 : OComponentHelper::release & WeakAggComponentImplHelperBase::release:
when our ref count drops to 0, call OWeakObject's disposeWeakConnectionPoint before (temporarily) incrementing
the ref count, again. This ensures that our adapter cannot create references to the dying object anymore.
(A complex test case in dbaccess (#i105505#) triggered such a situation, but in another class using an analogous
release/dispose/destroy pattern, namely WeakComponentImplHelperBase)
2009-10-07 06:37:20 +0000 fs  r276738 : found during some new complex test cases: call disposeWeakConnectionPoint before actually starting to destroy the object, this ensures no other threads will resurrect it while it is dying
2009-10-06 21:58:24 +0000 fs  r276734 : oops, two small corrections to the previous fix (hey, complex test cases are cool)
2009-10-06 21:51:16 +0000 fs  r276733 : log the name of the data source which cannot be revoked
2009-10-06 21:50:41 +0000 fs  r276732 : more detailed error message when cleanup fails
2009-10-06 21:50:01 +0000 fs  r276731 : reworked the ModelImpl caching. The new and improved UNO API test for css.sdb.RowSet
revealed some inconsistencies, in whether the objects are cached by their URL, or by their
registration name. This has been changed to caching by registration name.
2009-10-06 13:50:34 +0000 fs  r276714 : print diagnostics when we cannot clean up the test case
2009-10-06 13:45:02 +0000 fs  r276713 : this test failed all the time, since the core (rightfully) threw an exception. Disabled it for the moment, until issue 84253 is fixed
2009-10-06 12:52:46 +0000 fs  r276711 : rewrote this test. Now we do not re-use the same .odb across different test cases, as this leads to unreliable
(timing-dependent) results/failures. Instead, every test sets up a new odb file.
Also, did some re-factoring, improved the cleanup code, and caught a few more errors.
2009-10-06 12:51:07 +0000 fs  r276710 : DBTools taking a logger now
2009-10-06 12:50:42 +0000 fs  r276709 : taking a PrintWriter for logging purpose
2009-10-06 12:50:03 +0000 fs  r276708 : DBTools taking a logger now
2009-10-06 12:49:22 +0000 fs  r276707 : typo
2009-10-06 12:49:03 +0000 fs  r276706 : typo
2009-10-06 12:48:52 +0000 fs  r276705 : wrappers around some database-related services - initial versions only, to evolve over time, and intended to finally replace the DBTools class
2009-10-06 12:48:02 +0000 fs  r276704 : typo
2009-10-06 12:38:42 +0000 fs  r276702 : some better diagnostics, done during getting the API tests to work more reliably
2009-10-06 10:35:51 +0000 fs  r276698 : when living in, e.g., the DataSourceBrowser, we can't expect to find an XModifiable2, so don't assert its existence
2009-10-05 12:47:52 +0000 oj  r276677 : #i105607# check for read moved into if scope
2009-10-05 11:37:06 +0000 fs  r276676 : when saving a file fails, retrieve the error message from the InteractionRequestStringResolver - this is better than any generic message we can create
2009-10-05 10:04:23 +0000 oj  r276673 : #i105607# check for read moved into if scope
2009-10-05 09:46:17 +0000 fs  r276671 : #i10000#
2009-10-05 08:43:58 +0000 fs  r276664 : #i105505#
release: dispose the (base classes) weak connection point before disposing ourself,
and in particular before temporarily incrementing our ref count, again.
This way, we prevent that a separate thread re-surrects us (using the weak connection
point's queryAdapted) while we're in the process of destruction
2009-10-05 08:41:49 +0000 fs  r276663 : #i105505# +disposeWeakConnectionPoint (outsourced into dedicated method from ::release)
2009-10-05 08:40:26 +0000 fs  r276662 : no need to derived from OSubComponent, its features are not used, directly derive from WeakComponentImplFoo instead
2009-10-05 08:39:38 +0000 fs  r276661 : #i105505# diagnostics
2009-10-05 08:39:16 +0000 fs  r276660 : #i105505# +testDocumentRevenants
2009-10-05 08:36:01 +0000 fs  r276659 : #i105560# reverted the removal of GenericController::openHelpAgent - this is needed in module reportdesign
2009-10-04 19:53:30 +0000 fs  r276657 : #105560#
remove unused code
thanks to cmc@openoffice.org for submitting the patch
2009-10-04 19:50:28 +0000 fs  r276656 : #i105550# remove unused 'fire' method (thanks to cmc)
2009-10-03 16:13:15 +0000 fs  r276655 : CWS-TOOLING: rebase CWS dba33a to trunk@276429 (milestone: DEV300:m60)
2009-10-02 19:20:48 +0000 fs  r276651 : #i104117# lotta changed IDs ...
2009-10-02 10:52:24 +0000 fs  r276634 : #i105505#
If a model is created, and is a revenant of a previous incarnation, then ensure it is properly initialized.
In particular, in its ctor, set the state to "Initializing", not "Initialized", and then let the ModelImpl
call attachResource. This ensures that the model is initialized completely, including firing the necessary
events.
2009-10-02 10:51:08 +0000 fs  r276633 : #i105505# always do an attachResource at the newly loaded model, even if it (internally) was not really loaded, but only a revenant of a previous incarnation of this document
2009-10-01 11:10:13 +0000 fs  r276597 : do not rely on the name 'Standard' for the one and only form in a document
2009-10-01 10:36:29 +0000 fs  r276590 : #i105509# don't rely on default form component names, use indexes
2009-10-01 09:12:20 +0000 fs  r276582 : #i105505#
2009-09-30 07:55:21 +0000 fs  r276542 : removed some unsed methods / spared some unnecessary pixel<->logic conversion
2009-09-30 07:53:22 +0000 fs  r276541 : removed unneeded methods
2009-09-30 06:35:59 +0000 fs  r276538 : #i10000#
2009-09-29 13:45:02 +0000 fs  r276531 : refactored the Roadmap* classes, to be able to fix above-mentioned #i105113#
2009-09-29 10:27:10 +0000 fs  r276520 : #i105367#
2009-09-29 08:46:45 +0000 fs  r276510 : #i104956# cleaned up the makefiles
2009-09-28 21:00:07 +0000 fs  r276505 : #i104117# sourced those IDs out from extension.hrc
2009-09-28 20:59:05 +0000 fs  r276504 : no need to let one FREE...
2009-09-28 20:53:36 +0000 fs  r276503 : #i104117#
cleaned up the mess with help IDs in module extensions.
Formerly, extensions used to use help IDs which were declared in module svx, and vice versa.
Also, help ID ranges were not respected.
2009-09-28 11:25:36 +0000 fs  r276489 : typo
2009-09-28 11:25:10 +0000 fs  r276488 : #i105235#
2009-09-24 11:53:16 +0000 fs  r276423 : #i105234# do not zoom the control when they view information is still uninitialized (happens at least in Writer when opening a form document)
2009-09-24 09:42:28 +0000 fs  r276415 : #i105234# proper zoom handling for the nav bar
2009-09-24 09:42:19 +0000 fs  r276414 : #i105234# setZoom: care for precision errors caused by implicit conversion float->double
2009-09-16 11:11:43 +0000 fs  r276195 : #i105082#
consolidated the sub storage handling, by delegating more functionality into
the DocumentStorageAccess class. As a result, there won't be that many unnecessary
commits anymore. Also, the two different storage caches (in ModelImpl::m_aStorages
and DocumentStorageAccess::m_aExposedStorages) have been consolidated.
This is not really part of the fix of issue 105082, but it helped reducing the
calls to the storage/package implementation.
2009-09-15 21:42:27 +0000 fs  r276190 : don't calculate space for BOLD if the text is not really bold (speeds up rendering for large tree structures)
2009-09-15 20:20:23 +0000 fs  r276188 : getTypeInfo: fill m_aTypeInfoRows only if really all type infos could be retrieved
2009-09-15 20:19:29 +0000 fs  r276187 : do not continue loading when the controller initialization throws an error
2009-09-14 12:25:57 +0000 fs  r276119 : oops, this patch was not intended for this CWS
2009-09-14 12:13:57 +0000 fs  r276114 : #cr6875455# introduce a ReferenceDevice property for various control models
2009-09-14 10:33:02 +0000 fs  r276106 : removed dead file
2009-09-09 08:37:31 +0000 fs  r275972 : remove OSL_TRACE in VCLXButton dtor
2009-09-08 11:19:17 +0000 oj  r275926 : i76534# remove mnemonic from fixed text
2009-09-07 08:39:37 +0000 fs  r275874 : create CWS dba33a from cws/dba32g@275857 (CWS: dba32g)

1 files changed, 529 insertions, 429 deletions

diff --git a/helpcontent2/helpers/hid.lst b/helpcontent2/helpers/hid.lst
index 23e6c6f499..63052504a8 100644
--- a/helpcontent2/helpers/hid.lst
+++ b/helpcontent2/helpers/hid.lst
@@ -1,6 +1,5 @@
-DEV300.m52 010101010101010
+DEV300.m57 010101010101010
 
-0 0
 1 1
 DLG_INSERT_PAGES_OBJS 938
 DLG_JOIN_TABADD 19214
@@ -501,7 +500,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
@@ -662,11 +660,11 @@ HID_AAI_FUNC_YEARFRAC 59069
 HID_AAI_FUNC_YIELD 59091
 HID_AAI_FUNC_YIELDDISC 59092
 HID_AAI_FUNC_YIELDMAT 59093
-HID_ABSPILOT 34836
-HID_ABSPILOT_CANCEL 34833
-HID_ABSPILOT_FINISH 34834
-HID_ABSPILOT_NEXT 34832
-HID_ABSPILOT_PREVIOUS 34831
+HID_ABSPILOT 65074
+HID_ABSPILOT_CANCEL 65071
+HID_ABSPILOT_FINISH 65072
+HID_ABSPILOT_NEXT 65070
+HID_ABSPILOT_PREVIOUS 65069
 HID_ACCELCONFIG_LISTBOX 40078
 HID_ADDRTEMPL_FIELD_ASSIGNMENT 32997
 HID_ADD_STYLES_TLB 53244
@@ -881,49 +879,49 @@ HID_BG_BTN_IMG9 34305
 HID_BG_BTN_NONE 34292
 HID_BG_BTN_OK 34293
 HID_BG_BTN_OTHER 34291
-HID_BIB_ADDRESS_POS 34794
-HID_BIB_ANNOTE_POS 34789
-HID_BIB_AUTHORITYTYPE_POS 34775
-HID_BIB_AUTHOR_POS 34776
+HID_BIB_ADDRESS_POS 65114
+HID_BIB_ANNOTE_POS 65109
+HID_BIB_AUTHORITYTYPE_POS 65095
+HID_BIB_AUTHOR_POS 65096
 HID_BIB_BASE 52769
-HID_BIB_BOOKTITLE_POS 34780
-HID_BIB_CHANGESOURCE 34769
-HID_BIB_CHAPTER_POS 34781
-HID_BIB_CONTROL_PAGE 34807
-HID_BIB_CONTROL_PARENT 34808
-HID_BIB_CUSTOM1_POS 34800
-HID_BIB_CUSTOM2_POS 34801
-HID_BIB_CUSTOM3_POS 34802
-HID_BIB_CUSTOM4_POS 34803
-HID_BIB_CUSTOM5_POS 34804
-HID_BIB_DB_GRIDCTRL 34806
-HID_BIB_DB_TBX 34805
-HID_BIB_DELETE_RECORD 34840
-HID_BIB_EDITION_POS 34782
-HID_BIB_EDITOR_POS 34783
-HID_BIB_HOWPUBLISHED_POS 34784
-HID_BIB_IDENTIFIER_POS 34774
-HID_BIB_INSERT_RECORD 34841
-HID_BIB_INSTITUTION_POS 34785
-HID_BIB_ISBN_POS 34779
-HID_BIB_JOURNAL_POS 34786
-HID_BIB_MAPPINGDLG 34770
-HID_BIB_MONTH_POS 34787
-HID_BIB_NOTE_POS 34788
-HID_BIB_NUMBER_POS 34790
-HID_BIB_ORGANIZATIONS_POS 34791
-HID_BIB_PAGES_POS 34792
-HID_BIB_PUBLISHER_POS 34793
-HID_BIB_REPORTTYPE_POS 34797
-HID_BIB_SCHOOL_POS 34795
-HID_BIB_SERIES_POS 34796
-HID_BIB_TBX_AUTOFILTER 34773
-HID_BIB_TBX_SEARCH 34772
-HID_BIB_TBX_TABLE 34771
-HID_BIB_TITLE_POS 34777
-HID_BIB_URL_POS 34799
-HID_BIB_VOLUME_POS 34798
-HID_BIB_YEAR_POS 34778
+HID_BIB_BOOKTITLE_POS 65100
+HID_BIB_CHANGESOURCE 65089
+HID_BIB_CHAPTER_POS 65101
+HID_BIB_CONTROL_PAGE 65127
+HID_BIB_CONTROL_PARENT 65128
+HID_BIB_CUSTOM1_POS 65120
+HID_BIB_CUSTOM2_POS 65121
+HID_BIB_CUSTOM3_POS 65122
+HID_BIB_CUSTOM4_POS 65123
+HID_BIB_CUSTOM5_POS 65124
+HID_BIB_DB_GRIDCTRL 65132
+HID_BIB_DB_TBX 65125
+HID_BIB_DELETE_RECORD 65130
+HID_BIB_EDITION_POS 65102
+HID_BIB_EDITOR_POS 65103
+HID_BIB_HOWPUBLISHED_POS 65104
+HID_BIB_IDENTIFIER_POS 65094
+HID_BIB_INSERT_RECORD 65131
+HID_BIB_INSTITUTION_POS 65105
+HID_BIB_ISBN_POS 65099
+HID_BIB_JOURNAL_POS 65106
+HID_BIB_MAPPINGDLG 65090
+HID_BIB_MONTH_POS 65107
+HID_BIB_NOTE_POS 65108
+HID_BIB_NUMBER_POS 65110
+HID_BIB_ORGANIZATIONS_POS 65111
+HID_BIB_PAGES_POS 65112
+HID_BIB_PUBLISHER_POS 65113
+HID_BIB_REPORTTYPE_POS 65117
+HID_BIB_SCHOOL_POS 65115
+HID_BIB_SERIES_POS 65116
+HID_BIB_TBX_AUTOFILTER 65093
+HID_BIB_TBX_SEARCH 65092
+HID_BIB_TBX_TABLE 65091
+HID_BIB_TITLE_POS 65097
+HID_BIB_URL_POS 65119
+HID_BIB_VOLUME_POS 65118
+HID_BIB_YEAR_POS 65098
 HID_BMPMASK_CTL_PIPETTE 33873
 HID_BMPMASK_CTL_QCOL_1 33872
 HID_BMPMASK_TBI_PIPETTE 33898
@@ -994,16 +992,16 @@ HID_CHARMAP_CTL_SHOWCHAR 33878
 HID_CHARMAP_CTL_SHOWSET 33876
 HID_CHARMAP_CTL_SHOWTEXT 33877
 HID_CHAR_URL 53190
-HID_CHECK_FOR_UPD_CANCEL 34855
-HID_CHECK_FOR_UPD_CLOSE 34846
-HID_CHECK_FOR_UPD_DESCRIPTION 34854
-HID_CHECK_FOR_UPD_DLG 34845
-HID_CHECK_FOR_UPD_DOWNLOAD 34850
-HID_CHECK_FOR_UPD_DOWNLOAD2 34851
-HID_CHECK_FOR_UPD_INSTALL 34852
-HID_CHECK_FOR_UPD_PAUSE 34848
-HID_CHECK_FOR_UPD_RESUME 34849
-HID_CHECK_FOR_UPD_STATUS 34853
+HID_CHECK_FOR_UPD_CANCEL 65558
+HID_CHECK_FOR_UPD_CLOSE 65550
+HID_CHECK_FOR_UPD_DESCRIPTION 65557
+HID_CHECK_FOR_UPD_DLG 65549
+HID_CHECK_FOR_UPD_DOWNLOAD 65553
+HID_CHECK_FOR_UPD_DOWNLOAD2 65554
+HID_CHECK_FOR_UPD_INSTALL 65555
+HID_CHECK_FOR_UPD_PAUSE 65551
+HID_CHECK_FOR_UPD_RESUME 65552
+HID_CHECK_FOR_UPD_STATUS 65556
 HID_CHG_PROTECT 58946
 HID_CHKFOOTERNEXTPAGES 41146
 HID_CHKFOOTERPAGENUMBERS 41147
@@ -1174,7 +1172,7 @@ HID_CONTDLG_TOOLBOX 33979
 HID_CONTDLG_UNDO 33929
 HID_CONTDLG_WORKPLACE 33919
 HID_CONTENT_OPT 53191
-HID_CONTROLS_DATE_N_TIME 38194
+HID_CONTROLS_DATE_N_TIME 37792
 HID_CTL_ACTION_DLG_1 59870
 HID_CTL_ACTION_DLG_2 59871
 HID_CTL_FONTWORK_FAVORITES 33862
@@ -1201,15 +1199,9 @@ HID_DATABROWSE_HEADER 38785
 HID_DATAPILOT_DATABASE 58996
 HID_DATAPILOT_SERVICE 58997
 HID_DATAPILOT_TYPE 58995
-HID_DATA_NAVIGATOR_WIN 38107
+HID_DATA_NAVIGATOR_WIN 37803
 HID_DATA_SOURCES_UNAVAILABLE 54951
 HID_DBACCESS_START 38768
-HID_DBIWIZARD 34837
-HID_DBIWIZARD_CANCEL 34823
-HID_DBIWIZARD_FILESELECTION 34839
-HID_DBIWIZARD_FINISH 34824
-HID_DBIWIZARD_NEXT 34822
-HID_DBIWIZARD_PREVIOUS 34821
 HID_DBPATH_CTL_PATH 35153
 HID_DBPATH_HEADERBAR 35154
 HID_DBWIZ_CANCEL 39057
@@ -1544,7 +1536,7 @@ HID_DLG_COOKIES 35839
 HID_DLG_CREATE_AUTH_ENTRY 53246
 HID_DLG_CREATE_AUTOMARK 54917
 HID_DLG_DATABASE_WIZARD 39148
-HID_DLG_DBCHANGE 34843
+HID_DLG_DBCHANGE 65134
 HID_DLG_DEFINE_CUSTOMSHOW 59867
 HID_DLG_DEFINE_CUSTOMSHOW_CTL 59868
 HID_DLG_ERROR 38842
@@ -1555,7 +1547,7 @@ HID_DLG_FLDEDT_NEXT 53059
 HID_DLG_FLDEDT_PREV 53060
 HID_DLG_GLOSS_DECIDE 52976
 HID_DLG_LOGIN 35838
-HID_DLG_MAPPING 34842
+HID_DLG_MAPPING 65133
 HID_DLG_MASTERPASSWORD_CRT 35841
 HID_DLG_MASTERPASSWORD_UUI 35840
 HID_DLG_MESSBOX 33819
@@ -1731,39 +1723,39 @@ HID_ENVELOP_PRINT 54820
 HID_ENV_ENV 53186
 HID_ENV_FMT 53187
 HID_ENV_PRT 53184
-HID_EVT_ACTIONPERFORMED 38068
-HID_EVT_ADJUSTMENTVALUECHANGED 38100
-HID_EVT_AFTERUPDATE 38069
-HID_EVT_APPROVEACTIONPERFORMED 38090
-HID_EVT_APPROVEPARAMETER 38093
-HID_EVT_APPROVERESETTED 38091
-HID_EVT_APPROVEROWCHANGE 38096
-HID_EVT_BEFOREUPDATE 38070
-HID_EVT_CHANGED 38089
-HID_EVT_CONFIRMDELETE 38071
-HID_EVT_ERROROCCURED 38072
-HID_EVT_FOCUSGAINED 38073
-HID_EVT_FOCUSLOST 38074
-HID_EVT_ITEMSTATECHANGED 38075
-HID_EVT_KEYTYPED 38076
-HID_EVT_KEYUP 38092
-HID_EVT_LOADED 38077
-HID_EVT_MOUSEDRAGGED 38078
-HID_EVT_MOUSEENTERED 38079
-HID_EVT_MOUSEEXITED 38080
-HID_EVT_MOUSEMOVED 38081
-HID_EVT_MOUSEPRESSED 38082
-HID_EVT_MOUSERELEASED 38083
-HID_EVT_POSITIONED 38084
-HID_EVT_POSITIONING 38094
-HID_EVT_RELOADED 38095
-HID_EVT_RELOADING 38098
-HID_EVT_RESETTED 38085
-HID_EVT_ROWCHANGE 38097
-HID_EVT_SUBMITTED 38086
-HID_EVT_TEXTCHANGED 38087
-HID_EVT_UNLOADED 38088
-HID_EVT_UNLOADING 38099
+HID_EVT_ACTIONPERFORMED 65389
+HID_EVT_ADJUSTMENTVALUECHANGED 65421
+HID_EVT_AFTERUPDATE 65390
+HID_EVT_APPROVEACTIONPERFORMED 65411
+HID_EVT_APPROVEPARAMETER 65414
+HID_EVT_APPROVERESETTED 65412
+HID_EVT_APPROVEROWCHANGE 65417
+HID_EVT_BEFOREUPDATE 65391
+HID_EVT_CHANGED 65410
+HID_EVT_CONFIRMDELETE 65392
+HID_EVT_ERROROCCURED 65393
+HID_EVT_FOCUSGAINED 65394
+HID_EVT_FOCUSLOST 65395
+HID_EVT_ITEMSTATECHANGED 65396
+HID_EVT_KEYTYPED 65397
+HID_EVT_KEYUP 65413
+HID_EVT_LOADED 65398
+HID_EVT_MOUSEDRAGGED 65399
+HID_EVT_MOUSEENTERED 65400
+HID_EVT_MOUSEEXITED 65401
+HID_EVT_MOUSEMOVED 65402
+HID_EVT_MOUSEPRESSED 65403
+HID_EVT_MOUSERELEASED 65404
+HID_EVT_POSITIONED 65405
+HID_EVT_POSITIONING 65415
+HID_EVT_RELOADED 65416
+HID_EVT_RELOADING 65419
+HID_EVT_RESETTED 65406
+HID_EVT_ROWCHANGE 65418
+HID_EVT_SUBMITTED 65407
+HID_EVT_TEXTCHANGED 65408
+HID_EVT_UNLOADED 65409
+HID_EVT_UNLOADING 65420
 HID_EXPIRED 64365
 HID_EXPLORERDLG_COLLECTION 39037
 HID_EXPLORERDLG_FILE 32998
@@ -1802,13 +1794,13 @@ HID_FAX_PAGE8 53286
 HID_FCOMMAND_FILENAME 58936
 HID_FCOMMAND_PATH 58937
 HID_FCOMMAND_TITEL 58935
-HID_FIELDLINK_DETAIL_COLUMN 37917
-HID_FIELDLINK_MASTER_COLUMN 37918
+HID_FIELDLINK_DETAIL_COLUMN 65283
+HID_FIELDLINK_MASTER_COLUMN 65284
 HID_FIELD_CLOSE 54843
 HID_FIELD_DINF_TYPE 54846
 HID_FIELD_INSERT 54842
-HID_FIELD_SEL 38070
-HID_FIELD_SEL_WIN 38071
+HID_FIELD_SEL 37772
+HID_FIELD_SEL_WIN 37773
 HID_FILEDLG_AUTOCOMPLETEBOX 33286
 HID_FILEDLG_CHARDLG 53063
 HID_FILEDLG_EDIT_FAVORITES_HEADERBAR 33305
@@ -1858,9 +1850,13 @@ HID_FILEVIEW_MENU_DELETE 32999
 HID_FILEVIEW_MENU_RENAME 33000
 HID_FILL_ATTR_LISTBOX 39869
 HID_FILL_TYPE_LISTBOX 39870
-HID_FILTER_NAVIGATOR 38072
-HID_FILTER_NAVIGATOR_WIN 38073
+HID_FILTER_NAVIGATOR 37774
+HID_FILTER_NAVIGATOR_WIN 37775
+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
@@ -1884,11 +1880,7 @@ HID_FLD_INPUT 52774
 HID_FLD_REF 53210
 HID_FLD_VAR 53207
 HID_FM_CTL_SELECTION 59884
-HID_FM_DLG_SEARCH 38177
-HID_FM_PROPDLG_TABCTR 38173
-HID_FM_PROPDLG_TAB_DATA 38175
-HID_FM_PROPDLG_TAB_EVT 38176
-HID_FM_PROPDLG_TAB_GENERAL 38174
+HID_FM_DLG_SEARCH 37776
 HID_FONTWORK_CTL_FORMS 33879
 HID_FONTWORK_TBI_ADJUST_AUTOSIZE 33910
 HID_FONTWORK_TBI_ADJUST_CENTER 33908
@@ -1939,8 +1931,8 @@ HID_FORMULA_FAP_PAGE 64852
 HID_FORMULA_FAP_STRUCT 64851
 HID_FORMULA_LB_CATEGORY 64865
 HID_FORMULA_LB_FUNCTION 64866
-HID_FORM_NAVIGATOR 38068
-HID_FORM_NAVIGATOR_WIN 38069
+HID_FORM_NAVIGATOR 37770
+HID_FORM_NAVIGATOR_WIN 37771
 HID_FRAME_TOOLBOX 54829
 HID_FRM_ADD 53195
 HID_FRM_EXT 53169
@@ -2294,24 +2286,24 @@ HID_GRFFILTER_SMOOTH 34150
 HID_GRFFILTER_SOBEL 34153
 HID_GRFFILTER_SOLARIZE 34159
 HID_GRF_EXT 53171
-HID_GRIDWIZARD_CANCEL 34811
-HID_GRIDWIZARD_FINISH 34812
-HID_GRIDWIZARD_NEXT 34810
-HID_GRIDWIZARD_PREVIOUS 34809
-HID_GRID_NUMBEROFRECORDS 38202
-HID_GRID_TRAVEL_ABSOLUTE 38201
-HID_GRID_TRAVEL_FIRST 38196
-HID_GRID_TRAVEL_LAST 38199
-HID_GRID_TRAVEL_NEW 38200
-HID_GRID_TRAVEL_NEXT 38198
-HID_GRID_TRAVEL_PREV 38197
+HID_GRIDWIZARD_CANCEL 65063
+HID_GRIDWIZARD_FINISH 65064
+HID_GRIDWIZARD_NEXT 65062
+HID_GRIDWIZARD_PREVIOUS 65061
+HID_GRID_NUMBEROFRECORDS 37799
+HID_GRID_TRAVEL_ABSOLUTE 37798
+HID_GRID_TRAVEL_FIRST 37793
+HID_GRID_TRAVEL_LAST 37796
+HID_GRID_TRAVEL_NEW 37797
+HID_GRID_TRAVEL_NEXT 37795
+HID_GRID_TRAVEL_PREV 37794
 HID_GROUPVIEW_CONTENT_BIG 33280
 HID_GROUPVIEW_CONTENT_SMALL 33281
 HID_GROUPVIEW_CONTENT_TREE 33282
-HID_GROUPWIZARD_CANCEL 34815
-HID_GROUPWIZARD_FINISH 34816
-HID_GROUPWIZARD_NEXT 34814
-HID_GROUPWIZARD_PREVIOUS 34813
+HID_GROUPWIZARD_CANCEL 65055
+HID_GROUPWIZARD_FINISH 65056
+HID_GROUPWIZARD_NEXT 65054
+HID_GROUPWIZARD_PREVIOUS 65053
 HID_HANGULDLG_BUTTON_CHANGE 39892
 HID_HANGULDLG_BUTTON_CHANGEALL 39893
 HID_HANGULDLG_BUTTON_CLOSE 39889
@@ -2507,10 +2499,10 @@ HID_LINGU_REPLACE 53434
 HID_LINGU_SPELLING_DLG 53432
 HID_LINGU_WORD_LANGUAGE 53437
 HID_LINKDLG_TABLB 34869
-HID_LISTWIZARD_CANCEL 34819
-HID_LISTWIZARD_FINISH 34820
-HID_LISTWIZARD_NEXT 34818
-HID_LISTWIZARD_PREVIOUS 34817
+HID_LISTWIZARD_CANCEL 65059
+HID_LISTWIZARD_FINISH 65060
+HID_LISTWIZARD_NEXT 65058
+HID_LISTWIZARD_PREVIOUS 65057
 HID_LNGDLG_NUM_PREBREAK 34168
 HID_LSTCOMMUNICATIONTYPE 41128
 HID_LSTGREETING 41133
@@ -2724,13 +2716,13 @@ HID_MN_READONLY_SAVEBACKGROUND 53417
 HID_MN_READONLY_SAVEGRAPHIC 53413
 HID_MN_READONLY_TOGALLERYCOPY 53416
 HID_MN_READONLY_TOGALLERYLINK 53415
-HID_MN_XFORMS_INSTANCES_ADD 38119
-HID_MN_XFORMS_INSTANCES_EDIT 38120
-HID_MN_XFORMS_INSTANCES_REMOVE 38121
-HID_MN_XFORMS_MODELS_ADD 38116
-HID_MN_XFORMS_MODELS_EDIT 38117
-HID_MN_XFORMS_MODELS_REMOVE 38118
-HID_MN_XFORMS_SHOW_DETAILS 38122
+HID_MN_XFORMS_INSTANCES_ADD 37815
+HID_MN_XFORMS_INSTANCES_EDIT 37816
+HID_MN_XFORMS_INSTANCES_REMOVE 37817
+HID_MN_XFORMS_MODELS_ADD 37812
+HID_MN_XFORMS_MODELS_EDIT 37813
+HID_MN_XFORMS_MODELS_REMOVE 37814
+HID_MN_XFORMS_SHOW_DETAILS 37818
 HID_MODULE_TOOLBOX 54952
 HID_MULTIPATH 33825
 HID_MULTI_TOX_DLG 53073
@@ -2872,7 +2864,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
@@ -2909,6 +2900,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
@@ -2989,83 +2981,198 @@ HID_PRINTDIALOG_TOFILE 33021
 HID_PRINTMONITOR 33072
 HID_PRINT_AS_MERGE 54949
 HID_PRINT_OPTIONS 33124
-HID_PROP_ANCHOR_TYPE 38111
-HID_PROP_AUTOLINEBREAK 37932
-HID_PROP_BINDING_NAME 38019
-HID_PROP_BIND_EXPRESSION 37998
-HID_PROP_BLOCKINCREMENT 37892
-HID_PROP_BORDERCOLOR 38105
-HID_PROP_BOUND_CELL 37900
-HID_PROP_CELL_EXCHANGE_TYPE 37902
-HID_PROP_DEFAULT_SCROLLVALUE 37905
-HID_PROP_DEFAULT_SPINVALUE 37911
-HID_PROP_ENABLE_VISIBLE 37862
-HID_PROP_FOCUSONCLICK 38102
-HID_PROP_HIDEINACTIVESELECTION 38103
-HID_PROP_ICONSIZE 37927
-HID_PROP_IMAGEPOSITION 38107
-HID_PROP_INPUT_REQUIRED 37769
-HID_PROP_LINEEND_FORMAT 37934
-HID_PROP_LINEINCREMENT 37891
-HID_PROP_LIST_BINDING 38018
-HID_PROP_LIST_CELL_RANGE 37901
-HID_PROP_NOLABEL 38108
-HID_PROP_ORIENTATION 37894
-HID_PROP_POSITIONX 37895
-HID_PROP_POSITIONY 37896
-HID_PROP_PROGRESSVALUE 37886
-HID_PROP_PROGRESSVALUE_MAX 37888
-HID_PROP_PROGRESSVALUE_MIN 37887
-HID_PROP_PUSHBUTTONTYPE 37897
-HID_PROP_REPEAT 37913
-HID_PROP_REPEAT_DELAY 37906
-HID_PROP_SCALEIMAGE 37899
-HID_PROP_SCROLLVALUE 37889
-HID_PROP_SCROLLVALUE_MAX 37890
-HID_PROP_SCROLLVALUE_MIN 37904
-HID_PROP_SELECTEDITEMS 37903
-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_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_SUBMISSION_ID 37942
-HID_PROP_SYMBOLCOLOR 37907
-HID_PROP_TABORDER_CONTROLS 37916
-HID_PROP_TEXTTYPE 37933
-HID_PROP_TITLE 37883
-HID_PROP_TOGGLE 38101
-HID_PROP_UNCHECKEDREFVALUE 37941
-HID_PROP_VALUE 37789
-HID_PROP_VISIBLESIZE 37893
-HID_PROP_VISUALEFFECT 38104
-HID_PROP_WHEEL_BEHAVIOR 37793
-HID_PROP_WORDBREAK 37914
-HID_PROP_WRITING_MODE 38109
-HID_PROP_XML_DATA_MODEL 37997
-HID_PROP_XSD_CALCULATION 38003
-HID_PROP_XSD_CONSTRAINT 38002
-HID_PROP_XSD_DATA_TYPE 38004
-HID_PROP_XSD_FRACTION_DIGITS 37936
-HID_PROP_XSD_LENGTH 38007
-HID_PROP_XSD_MAX_EXCLUSIVE 37938
-HID_PROP_XSD_MAX_INCLUSIVE 37937
-HID_PROP_XSD_MAX_LENGTH 38009
-HID_PROP_XSD_MIN_EXCLUSIVE 37940
-HID_PROP_XSD_MIN_INCLUSIVE 37939
-HID_PROP_XSD_MIN_LENGTH 37998
-HID_PROP_XSD_PATTERN 38006
-HID_PROP_XSD_READONLY 38001
-HID_PROP_XSD_RELEVANT 38000
-HID_PROP_XSD_REQUIRED 37999
-HID_PROP_XSD_TOTAL_DIGITS 37935
-HID_PROP_XSD_WHITESPACES 38005
+HID_PROP_ALIGN 65184
+HID_PROP_ALLOW_ADDITIONS 65154
+HID_PROP_ALLOW_DELETIONS 65156
+HID_PROP_ALLOW_EDITS 65155
+HID_PROP_ANCHOR_TYPE 65431
+HID_PROP_AUTOCOMPLETE 65216
+HID_PROP_AUTOLINEBREAK 65298
+HID_PROP_BACKGROUNDCOLOR 65180
+HID_PROP_BINDING_NAME 65380
+HID_PROP_BIND_EXPRESSION 65359
+HID_PROP_BLOCKINCREMENT 65258
+HID_PROP_BORDER 65183
+HID_PROP_BORDERCOLOR 65426
+HID_PROP_BOUNDCOLUMN 65170
+HID_PROP_BOUND_CELL 65266
+HID_PROP_BUTTONTYPE 65191
+HID_PROP_CELL_EXCHANGE_TYPE 65268
+HID_PROP_CLASSID 65165
+HID_PROP_CONTROLLABEL 65247
+HID_PROP_CONTROLSOURCE 65141
+HID_PROP_CURRENCYSYMBOL 65212
+HID_PROP_CURRSYM_POSITION 65248
+HID_PROP_CURSORSOURCE 65147
+HID_PROP_CURSORSOURCETYPE 65148
+HID_PROP_CURSORTYPE 65149
+HID_PROP_CYCLE 65153
+HID_PROP_DATAENTRY 65151
+HID_PROP_DATASOURCE 65146
+HID_PROP_DATE 65201
+HID_PROP_DATEFORMAT 65204
+HID_PROP_DATEMAX 65203
+HID_PROP_DATEMIN 65202
+HID_PROP_DECIMAL_ACCURACY 65229
+HID_PROP_DECORATION 65388
+HID_PROP_DEFAULTVALUE 65195
+HID_PROP_DEFAULT_BUTTON 65231
+HID_PROP_DEFAULT_DATE 65239
+HID_PROP_DEFAULT_LONG_VALUE 65237
+HID_PROP_DEFAULT_SCROLLVALUE 65271
+HID_PROP_DEFAULT_SELECT_SEQ 65199
+HID_PROP_DEFAULT_SPINVALUE 65277
+HID_PROP_DEFAULT_STATE 65197
+HID_PROP_DEFAULT_TIME 65238
+HID_PROP_DIRTY 65157
+HID_PROP_DROPDOWN 65185
+HID_PROP_ECHO_CHAR 65227
+HID_PROP_EDITABLE 65385
+HID_PROP_EDITMASK 65213
+HID_PROP_EFFECTIVEDEFAULT 65246
+HID_PROP_EFFECTIVEMAX 65245
+HID_PROP_EFFECTIVEMIN 65244
+HID_PROP_EMPTY_IS_NULL 65228
+HID_PROP_ENABLED 65215
+HID_PROP_ENABLE_VISIBLE 65230
+HID_PROP_ESCAPE_PROCESSING 65249
+HID_PROP_FILLCOLOR 65181
+HID_PROP_FILTER 65235
+HID_PROP_FILTERPROPOSAL 65243
+HID_PROP_FOCUSONCLICK 65423
+HID_PROP_FONT 65178
+HID_PROP_FORMATKEY 65161
+HID_PROP_GROUPBOX 65140
+HID_PROP_HEIGHT 65168
+HID_PROP_HELPTEXT 65240
+HID_PROP_HELPURL 65241
+HID_PROP_HIDDEN_VALUE 65232
+HID_PROP_HIDEINACTIVESELECTION 65424
+HID_PROP_HSCROLL 65187
+HID_PROP_ICONSIZE 65293
+HID_PROP_IMAGEPOSITION 65428
+HID_PROP_IMAGE_URL 65198
+HID_PROP_INPUT_REQUIRED 65139
+HID_PROP_INVOKES_STOP_NOT_EDITING 65386
+HID_PROP_LABEL 65175
+HID_PROP_LEFT 65166
+HID_PROP_LINECOLOR 65182
+HID_PROP_LINECOUNT 65217
+HID_PROP_LINEEND_FORMAT 65300
+HID_PROP_LINEINCREMENT 65257
+HID_PROP_LISTINDEX 65173
+HID_PROP_LISTSOURCE 65172
+HID_PROP_LISTSOURCETYPE 65171
+HID_PROP_LIST_BINDING 65379
+HID_PROP_LIST_CELL_RANGE 65267
+HID_PROP_LITERALMASK 65214
+HID_PROP_LOCKED 65160
+HID_PROP_MASTERFIELDS 65144
+HID_PROP_MAXTEXTLEN 65218
+HID_PROP_MULTILINE 65186
+HID_PROP_MULTISELECTION 65200
+HID_PROP_NAME 65142
+HID_PROP_NAVIGATION 65152
+HID_PROP_NAVIGATIONBAR 65234
+HID_PROP_NOLABEL 65429
+HID_PROP_OLDVALUE 65158
+HID_PROP_ORIENTATION 65260
+HID_PROP_POSITIONX 65261
+HID_PROP_POSITIONY 65262
+HID_PROP_PRINTABLE 65223
+HID_PROP_PROGRESSVALUE 65252
+HID_PROP_PROGRESSVALUE_MAX 65254
+HID_PROP_PROGRESSVALUE_MIN 65253
+HID_PROP_PUSHBUTTONTYPE 65263
+HID_PROP_READONLY 65150
+HID_PROP_RECORDMARKER 65242
+HID_PROP_REFVALUE 65190
+HID_PROP_REPEAT 65279
+HID_PROP_REPEAT_DELAY 65272
+HID_PROP_REQUIRED 65162
+HID_PROP_RIGHT 65167
+HID_PROP_ROOT_DISPLAYED 65382
+HID_PROP_ROWHEIGHT 65179
+HID_PROP_ROW_HEIGHT 65387
+HID_PROP_SCALEIMAGE 65265
+HID_PROP_SCROLLVALUE 65255
+HID_PROP_SCROLLVALUE_MAX 65256
+HID_PROP_SCROLLVALUE_MIN 65270
+HID_PROP_SEARCHING 65177
+HID_PROP_SELECTEDITEMS 65269
+HID_PROP_SELECTION_TYPE 65381
+HID_PROP_SHOWS_HANDLES 65383
+HID_PROP_SHOWS_ROOT_HANDLES 65384
+HID_PROP_SHOWTHOUSANDSEP 65221
+HID_PROP_SHOW_FILTERSORT 65297
+HID_PROP_SHOW_NAVIGATION 65295
+HID_PROP_SHOW_POSITION 65294
+HID_PROP_SHOW_RECORDACTIONS 65296
+HID_PROP_SHOW_SCROLLBARS 65281
+HID_PROP_SLAVEFIELDS 65145
+HID_PROP_SORT_CRITERIA 65236
+HID_PROP_SPIN 65219
+HID_PROP_SPININCREMENT 65278
+HID_PROP_SPINVALUE 65274
+HID_PROP_SPINVALUE_MAX 65276
+HID_PROP_SPINVALUE_MIN 65275
+HID_PROP_STATE 65264
+HID_PROP_STEP 65251
+HID_PROP_STRICTFORMAT 65220
+HID_PROP_STRINGITEMLIST 65176
+HID_PROP_SUBMISSION_ID 65308
+HID_PROP_SUBMIT_ACTION 65192
+HID_PROP_SUBMIT_ENCODING 65194
+HID_PROP_SUBMIT_METHOD 65193
+HID_PROP_SUBMIT_TARGET 65196
+HID_PROP_SYMBOLCOLOR 65273
+HID_PROP_TABINDEX 65143
+HID_PROP_TABORDER_CONTROLS 65282
+HID_PROP_TABSTOP 65189
+HID_PROP_TAG 65226
+HID_PROP_TARGET_FRAME 65225
+HID_PROP_TARGET_URL 65224
+HID_PROP_TEXT 65174
+HID_PROP_TEXTTYPE 65299
+HID_PROP_TIME 65205
+HID_PROP_TIMEFORMAT 65208
+HID_PROP_TIMEMAX 65207
+HID_PROP_TIMEMIN 65206
+HID_PROP_TITLE 65250
+HID_PROP_TOGGLE 65422
+HID_PROP_TRISTATE 65233
+HID_PROP_UNCHECKEDREFVALUE 65307
+HID_PROP_UNIQUE 65164
+HID_PROP_VALUE 65159
+HID_PROP_VALUEMAX 65210
+HID_PROP_VALUEMIN 65209
+HID_PROP_VALUESTEP 65211
+HID_PROP_VERTICAL_ALIGN 65222
+HID_PROP_VISIBLESIZE 65259
+HID_PROP_VISUALEFFECT 65425
+HID_PROP_VSCROLL 65188
+HID_PROP_WHEEL_BEHAVIOR 65163
+HID_PROP_WIDTH 65169
+HID_PROP_WORDBREAK 65280
+HID_PROP_WRITING_MODE 65430
+HID_PROP_XML_DATA_MODEL 65358
+HID_PROP_XSD_CALCULATION 65364
+HID_PROP_XSD_CONSTRAINT 65363
+HID_PROP_XSD_DATA_TYPE 65365
+HID_PROP_XSD_FRACTION_DIGITS 65302
+HID_PROP_XSD_LENGTH 65368
+HID_PROP_XSD_MAX_EXCLUSIVE 65304
+HID_PROP_XSD_MAX_INCLUSIVE 65303
+HID_PROP_XSD_MAX_LENGTH 65370
+HID_PROP_XSD_MIN_EXCLUSIVE 65306
+HID_PROP_XSD_MIN_INCLUSIVE 65305
+HID_PROP_XSD_MIN_LENGTH 65369
+HID_PROP_XSD_PATTERN 65367
+HID_PROP_XSD_READONLY 65362
+HID_PROP_XSD_RELEVANT 65361
+HID_PROP_XSD_REQUIRED 65360
+HID_PROP_XSD_TOTAL_DIGITS 65301
+HID_PROP_XSD_WHITESPACES 65366
 HID_PVIEW_TOOLBOX 54841
 HID_PVIEW_ZOOM_LB 54945
 HID_QRYDGN_ROW_ALIAS 38867
@@ -3680,25 +3787,25 @@ HID_SEARCHATTR 33820
 HID_SEARCHATTR_CTL_ATTR 33883
 HID_SEARCHDIALOG 33379
 HID_SEARCHSIMILARITY 33823
-HID_SEARCH_ALLFIELDS 38179
-HID_SEARCH_APPROX 38189
-HID_SEARCH_APPROXSETTINGS 38190
-HID_SEARCH_BACKWARD 38185
-HID_SEARCH_BTN_CLOSE 38192
-HID_SEARCH_BTN_SEARCH 38191
-HID_SEARCH_CASE 38184
+HID_SEARCH_ALLFIELDS 37778
+HID_SEARCH_APPROX 37788
+HID_SEARCH_APPROXSETTINGS 37789
+HID_SEARCH_BACKWARD 37784
+HID_SEARCH_BTN_CLOSE 37791
+HID_SEARCH_BTN_SEARCH 37790
+HID_SEARCH_CASE 37783
 HID_SEARCH_DLG_TABLB 33136
-HID_SEARCH_FIELDSELECTION 38181
-HID_SEARCH_FORMATTER 38183
-HID_SEARCH_POSITION 38182
-HID_SEARCH_REGULAR 38188
-HID_SEARCH_STARTOVER 38186
-HID_SEARCH_TEXT 38178
-HID_SEARCH_WILDCARD 38187
+HID_SEARCH_FIELDSELECTION 37780
+HID_SEARCH_FORMATTER 37782
+HID_SEARCH_POSITION 37781
+HID_SEARCH_REGULAR 37787
+HID_SEARCH_STARTOVER 37785
+HID_SEARCH_TEXT 37777
+HID_SEARCH_WILDCARD 37786
 HID_SECTION_FTNENDNOTES_PAGE 53249
 HID_SECTION_INDENTS_PAGE 54953
 HID_SECTION_PROPERTIES_DLG 53237
-HID_SELECTION_TLB 34844
+HID_SELECTION_TLB 65135
 HID_SELECTOR_CATEGORIES 40004
 HID_SELECTOR_COMMANDS 40005
 HID_SELECTOR_DIALOG 40006
@@ -4096,7 +4203,6 @@ HID_TABLE_DESIGN_NO_CONNECTION 38926
 HID_TABLE_DESIGN_TABPAGE_GENERAL 38893
 HID_TABLE_TEXTFLOW 53196
 HID_TABLE_TOOLBOX 54828
-HID_TABORDER_CONTROLS 38193
 HID_TABULATOR 33782
 HID_TAB_AUTOINCREMENTVALUE 38996
 HID_TAB_DESIGN_DESCWIN 38882
@@ -4226,26 +4332,25 @@ HID_WEBTOOLS_TOOLBOX 54824
 HID_WILL_EXPIRE 64366
 HID_WIZARD_NEXT 33022
 HID_WIZARD_PREVIOUS 33023
-HID_XFORMS_ADDCONDITION_DLG 38109
-HID_XFORMS_ADDDATAITEM_DLG 38108
-HID_XFORMS_ADDINSTANCE_DLG 38135
-HID_XFORMS_ADDMODEL_DLG 38134
-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
-HID_XFORMS_NAMESPACEITEM_LIST 38111
-HID_XFORMS_TAB_CONTROL 38137
-HID_XFORMS_TOOLBOX 38123
-HID_XFORMS_TOOLBOX_ITEM_ADD 38124
-HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE 38126
-HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT 38125
-HID_XFORMS_TOOLBOX_ITEM_EDIT 38127
-HID_XFORMS_TOOLBOX_ITEM_REMOVE 38128
+HID_XFORMS_ADDCONDITION_DLG 37805
+HID_XFORMS_ADDDATAITEM_DLG 37804
+HID_XFORMS_ADDINSTANCE_DLG 37831
+HID_XFORMS_ADDMODEL_DLG 37830
+HID_XFORMS_ADDSUBMISSION_DLG 37829
+HID_XFORMS_INSTANCES_MENUBTN 37828
+HID_XFORMS_ITEMS_LIST 37825
+HID_XFORMS_MANAGENAMESPACE_DLG 37808
+HID_XFORMS_MODELS_LIST 37826
+HID_XFORMS_MODELS_MENUBTN 37827
+HID_XFORMS_NAMESPACEITEM_DLG 37806
+HID_XFORMS_NAMESPACEITEM_LIST 37807
+HID_XFORMS_TAB_CONTROL 37833
+HID_XFORMS_TOOLBOX 37819
+HID_XFORMS_TOOLBOX_ITEM_ADD 37820
+HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE 37822
+HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT 37821
+HID_XFORMS_TOOLBOX_ITEM_EDIT 37823
+HID_XFORMS_TOOLBOX_ITEM_REMOVE 37824
 HID_XMLSECDLG_MACROWARN 35847
 HID_XMLSEC_CALL 40016
 HID_XMLSEC_CTRL_CHOOSESIGNATURES 43082
@@ -4318,8 +4423,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
@@ -5572,6 +5675,7 @@ SID_PARTWIN 6640
 SID_PASTE 5712
 SID_PASTE2 27003
 SID_PASTEOBJECT 30374
+SID_PASTE_UNFORMATTED 5314
 SID_PICKLIST 5510
 SID_PICK_THROUGH 27159
 SID_PIVOT_CREATE 26660
@@ -5841,7 +5945,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
@@ -5962,7 +6068,7 @@ SW_TABSHELL 254
 SW_TEXTSHELL 252
 SW_WEBFRAMESHELL 273
 SW_WEBTEXTSHELL 272
-UID_ABSPILOT_HELP 34835
+UID_ABSPILOT_HELP 65073
 UID_APP_CONTAINER_VIEW 39040
 UID_APP_DATABASE_VIEW 39038
 UID_APP_DETAILPAGE_HELPER 39043
@@ -5975,89 +6081,83 @@ UID_APP_VIEW_BORDER_WIN 39026
 UID_APP_VIEW_HORZ_SPLIT 39048
 UID_APP_VIEW_PREVIEW_1 39049
 UID_APP_VIEW_VERT_SPLIT 39025
-UID_BIB_FRAME_WINDOW 34830
-UID_BRWEVT_ACTIONPERFORMED 37965
-UID_BRWEVT_ADJUSTMENTVALUECHANGED 37996
-UID_BRWEVT_AFTERUPDATE 37983
-UID_BRWEVT_APPROVEACTIONPERFORMED 37964
-UID_BRWEVT_APPROVEPARAMETER 37994
-UID_BRWEVT_APPROVERESETTED 37979
-UID_BRWEVT_APPROVEROWCHANGE 37990
-UID_BRWEVT_BEFOREUPDATE 37982
-UID_BRWEVT_CHANGED 37966
-UID_BRWEVT_CONFIRMDELETE 37989
-UID_BRWEVT_ERROROCCURED 37995
-UID_BRWEVT_FOCUSGAINED 37969
-UID_BRWEVT_FOCUSLOST 37970
-UID_BRWEVT_ITEMSTATECHANGED 37968
-UID_BRWEVT_KEYTYPED 37971
-UID_BRWEVT_KEYUP 37972
-UID_BRWEVT_LOADED 37984
-UID_BRWEVT_MOUSEDRAGGED 37974
-UID_BRWEVT_MOUSEENTERED 37973
-UID_BRWEVT_MOUSEEXITED 37978
-UID_BRWEVT_MOUSEMOVED 37975
-UID_BRWEVT_MOUSEPRESSED 37976
-UID_BRWEVT_MOUSERELEASED 37977
-UID_BRWEVT_POSITIONED 37993
-UID_BRWEVT_POSITIONING 37992
-UID_BRWEVT_RELOADED 37986
-UID_BRWEVT_RELOADING 37985
-UID_BRWEVT_RESETTED 37980
-UID_BRWEVT_ROWCHANGE 37991
-UID_BRWEVT_SUBMITTED 37981
-UID_BRWEVT_TEXTCHANGED 37967
-UID_BRWEVT_UNLOADED 37988
-UID_BRWEVT_UNLOADING 37987
+UID_BIB_FRAME_WINDOW 65129
+UID_BRWEVT_ACTIONPERFORMED 65326
+UID_BRWEVT_ADJUSTMENTVALUECHANGED 65357
+UID_BRWEVT_AFTERUPDATE 65344
+UID_BRWEVT_APPROVEACTIONPERFORMED 65325
+UID_BRWEVT_APPROVEPARAMETER 65355
+UID_BRWEVT_APPROVERESETTED 65340
+UID_BRWEVT_APPROVEROWCHANGE 65351
+UID_BRWEVT_BEFOREUPDATE 65343
+UID_BRWEVT_CHANGED 65327
+UID_BRWEVT_CONFIRMDELETE 65350
+UID_BRWEVT_ERROROCCURED 65356
+UID_BRWEVT_FOCUSGAINED 65330
+UID_BRWEVT_FOCUSLOST 65331
+UID_BRWEVT_ITEMSTATECHANGED 65329
+UID_BRWEVT_KEYTYPED 65332
+UID_BRWEVT_KEYUP 65333
+UID_BRWEVT_LOADED 65345
+UID_BRWEVT_MOUSEDRAGGED 65335
+UID_BRWEVT_MOUSEENTERED 65334
+UID_BRWEVT_MOUSEEXITED 65339
+UID_BRWEVT_MOUSEMOVED 65336
+UID_BRWEVT_MOUSEPRESSED 65337
+UID_BRWEVT_MOUSERELEASED 65338
+UID_BRWEVT_POSITIONED 65354
+UID_BRWEVT_POSITIONING 65353
+UID_BRWEVT_RELOADED 65347
+UID_BRWEVT_RELOADING 65346
+UID_BRWEVT_RESETTED 65341
+UID_BRWEVT_ROWCHANGE 65352
+UID_BRWEVT_SUBMITTED 65342
+UID_BRWEVT_TEXTCHANGED 65328
+UID_BRWEVT_UNLOADED 65349
+UID_BRWEVT_UNLOADING 65348
 UID_BTN_LICENSE_ACCEPT 42784
 UID_CTL_CONTENT 38789
 UID_DATABROWSE_DATAWINDOW 38787
-UID_DBIWIZARD_FORMS 34828
-UID_DBIWIZARD_FORMS_SAVETO 34829
-UID_DBIWIZARD_HELP 34838
-UID_DBIWIZARD_QUERIES 34827
-UID_DBIWIZARD_SOURCEFILE 34826
-UID_DBIWIZARD_SOURCESTATS 34825
 UID_DBWIZ_HELP 39059
 UID_DLGINDEX_INDEXDETAILS_BACK 38971
 UID_DLGINDEX_INDEXDETAILS_MAIN 38972
 UID_DLG_TABLE_FILTER 39029
-UID_EVT_MACRODLG 37963
-UID_FIELDLINK_DETAIL1 37919
-UID_FIELDLINK_DETAIL2 37921
-UID_FIELDLINK_DETAIL3 37923
-UID_FIELDLINK_DETAIL4 37925
-UID_FIELDLINK_MASTER1 37920
-UID_FIELDLINK_MASTER2 37922
-UID_FIELDLINK_MASTER3 37924
-UID_FIELDLINK_MASTER4 37926
+UID_EVT_MACRODLG 65324
+UID_FIELDLINK_DETAIL1 65285
+UID_FIELDLINK_DETAIL2 65287
+UID_FIELDLINK_DETAIL3 65289
+UID_FIELDLINK_DETAIL4 65291
+UID_FIELDLINK_MASTER1 65286
+UID_FIELDLINK_MASTER2 65288
+UID_FIELDLINK_MASTER3 65290
+UID_FIELDLINK_MASTER4 65292
 UID_FIRSTSTART_HELP 42783
-UID_FORMPROPBROWSER_FRAME 38205
+UID_FORMPROPBROWSER_FRAME 37801
 UID_OFA_CONNPOOL_DRIVERLIST_BACK 35150
-UID_PROP_ADD_DATA_TYPE 38016
-UID_PROP_DLG_ATTR_DATASOURCE 37952
-UID_PROP_DLG_ATTR_TARGET_URL 37953
-UID_PROP_DLG_BACKGROUNDCOLOR 37950
-UID_PROP_DLG_BIND_EXPRESSION 38010
-UID_PROP_DLG_BORDERCOLOR 38106
-UID_PROP_DLG_CONTROLLABEL 37955
-UID_PROP_DLG_FILLCOLOR 37956
-UID_PROP_DLG_FILTER 37960
-UID_PROP_DLG_FONT_TYPE 37948
-UID_PROP_DLG_FORMLINKFIELDS 37959
-UID_PROP_DLG_IMAGE_URL 37949
-UID_PROP_DLG_NUMBER_FORMAT 37954
-UID_PROP_DLG_ORDER 37961
-UID_PROP_DLG_SELECTION 37962
-UID_PROP_DLG_SQLCOMMAND 37958
-UID_PROP_DLG_SYMBOLCOLOR 37951
-UID_PROP_DLG_TABINDEX 37957
-UID_PROP_DLG_XSD_CALCULATION 38015
-UID_PROP_DLG_XSD_CONSTRAINT 38014
-UID_PROP_DLG_XSD_READONLY 38013
-UID_PROP_DLG_XSD_RELEVANT 38012
-UID_PROP_DLG_XSD_REQUIRED 38011
-UID_PROP_REMOVE_DATA_TYPE 38017
+UID_PROP_ADD_DATA_TYPE 65377
+UID_PROP_DLG_ATTR_DATASOURCE 65313
+UID_PROP_DLG_ATTR_TARGET_URL 65314
+UID_PROP_DLG_BACKGROUNDCOLOR 65311
+UID_PROP_DLG_BIND_EXPRESSION 65371
+UID_PROP_DLG_BORDERCOLOR 65427
+UID_PROP_DLG_CONTROLLABEL 65316
+UID_PROP_DLG_FILLCOLOR 65317
+UID_PROP_DLG_FILTER 65321
+UID_PROP_DLG_FONT_TYPE 65309
+UID_PROP_DLG_FORMLINKFIELDS 65320
+UID_PROP_DLG_IMAGE_URL 65310
+UID_PROP_DLG_NUMBER_FORMAT 65315
+UID_PROP_DLG_ORDER 65322
+UID_PROP_DLG_SELECTION 65323
+UID_PROP_DLG_SQLCOMMAND 65319
+UID_PROP_DLG_SYMBOLCOLOR 65312
+UID_PROP_DLG_TABINDEX 65318
+UID_PROP_DLG_XSD_CALCULATION 65376
+UID_PROP_DLG_XSD_CONSTRAINT 65375
+UID_PROP_DLG_XSD_READONLY 65374
+UID_PROP_DLG_XSD_RELEVANT 65373
+UID_PROP_DLG_XSD_REQUIRED 65372
+UID_PROP_REMOVE_DATA_TYPE 65378
 UID_RPT_PROP_CHARTTYPE_DLG 64529
 UID_RPT_PROP_DLG_LINE_STYLE 64508
 UID_RPT_PROP_DLG_LINKFIELDS 64530
@@ -6069,7 +6169,7 @@ UID_RPT_RPT_PROP_DLG_FONT_TYPE 64525
 UID_RPT_SCROLLWINDOW 64450
 UID_RPT_SECTIONSWINDOW 64453
 UID_RPT_VIEWSWINDOW 64454
-UID_SEARCH_RECORDSTATUS 38203
+UID_SEARCH_RECORDSTATUS 37800
 UID_SQLERROR_BUTTONMORE 38844
 WID_SIMPLE_REF 25728
 basctl:CheckBox:RID_BASICIDE_BREAKPOINTDLG:RID_CHKB_ACTIVE 1318355975 
@@ -6340,6 +6440,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 
@@ -6416,7 +6517,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 
@@ -6459,35 +6559,30 @@ 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 
 desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NOW 586088965 
 extensions:CheckBox:RID_DLG_SELECTLABELCONTROL:1 1090126849 
-extensions:CheckBox:RID_PAGE_FINAL:CB_REGISTER_DS 860685313 
+extensions:CheckBox:RID_PAGE_FINAL:CB_REGISTER_DS 859702273 
 extensions:CheckBox:RID_SANE_DIALOG:RID_SCAN_ADVANCED_BOX 1090126881 
 extensions:CheckBox:RID_SANE_DIALOG:RID_SCAN_BOOL_OPTION_BOX 1090126870 
 extensions:CheckBox:RID_TP_LICENSE:CB_ACCEPT 553665555 
-extensions:ComboBox:RID_PAGE_FINAL:CBB_LOCATION 860688385 
-extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_TABLEFIELD 859787266 
-extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_VALUELISTFIELD 859787265 
+extensions:ComboBox:RID_PAGE_FINAL:CBB_LOCATION 859705345 
+extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_TABLEFIELD 860114946 
+extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_VALUELISTFIELD 860114945 
 extensions:Edit:RID_DLG_NEW_DATA_TYPE:ED_NAME 1090193410 
-extensions:Edit:RID_PAGE_FINAL:ET_DATASOURCENAME 860686337 
-extensions:Edit:RID_PAGE_GROUPRADIOSELECTION:ET_RADIOLABELS 859670529 
-extensions:Edit:RID_PAGE_LCW_CONTENTSELECTION_FIELD:ET_DISPLAYEDFIELD 859768836 
-extensions:Edit:RID_PAGE_OPTIONS_FINAL:ET_NAMEIT 859736067 
-extensions:Edit:RID_PAGE_OPTIONVALUES:ET_OPTIONVALUE 859703298 
+extensions:Edit:RID_PAGE_FINAL:ET_DATASOURCENAME 859703297 
+extensions:Edit:RID_PAGE_GROUPRADIOSELECTION:ET_RADIOLABELS 859998209 
+extensions:Edit:RID_PAGE_LCW_CONTENTSELECTION_FIELD:ET_DISPLAYEDFIELD 860096516 
+extensions:Edit:RID_PAGE_OPTIONS_FINAL:ET_NAMEIT 860063747 
+extensions:Edit:RID_PAGE_OPTIONVALUES:ET_OPTIONVALUE 860030978 
 extensions:Edit:RID_SANE_DIALOG:RID_SCAN_NUMERIC_OPTION_EDT 1090127899 
 extensions:Edit:RID_SANE_DIALOG:RID_SCAN_STRING_OPTION_EDT 1090127896 
 extensions:ListBox:GRID_DIALOG:GRID_DIALOG_TYPE_BOX 1091767812 
@@ -6523,17 +6618,17 @@ extensions:ListBox:RID_DLG_MAPPING:LB_URL 1330990649
 extensions:ListBox:RID_DLG_MAPPING:LB_VOLUME 1330990647 
 extensions:ListBox:RID_DLG_MAPPING:LB_YEAR 1330990613 
 extensions:ListBox:RID_DLG_SELECTION:LB_ENTRIES 1090178561 
-extensions:ListBox:RID_PAGE_DEFAULTFIELDSELECTION:LB_DEFSELECTIONFIELD 859688451 
-extensions:ListBox:RID_PAGE_GROUPRADIOSELECTION:LB_RADIOBUTTONS 859672067 
-extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_EXISTING_FIELDS 859803143 
-extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_SELECTED_FIELDS 859803144 
-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:LB_DATASOURCE 859655681 
-extensions:ListBox:RID_PAGE_TABLESELECTION:LB_TABLE 859655682 
-extensions:ListBox:RID_PAGE_TABLESELECTION_AB:LB_TABLELIST 860655105 
+extensions:ListBox:RID_PAGE_DEFAULTFIELDSELECTION:LB_DEFSELECTIONFIELD 860016131 
+extensions:ListBox:RID_PAGE_GROUPRADIOSELECTION:LB_RADIOBUTTONS 859999747 
+extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_EXISTING_FIELDS 860130823 
+extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_SELECTED_FIELDS 860130824 
+extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_FIELD:LB_SELECTFIELD 860098054 
+extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_TABLE:LB_SELECTTABLE 860081669 
+extensions:ListBox:RID_PAGE_OPTIONVALUES:LB_RADIOBUTTONS 860032515 
+extensions:ListBox:RID_PAGE_OPTION_DBFIELD:LB_STOREINFIELD 860048900 
+extensions:ListBox:RID_PAGE_TABLESELECTION:LB_DATASOURCE 859983361 
+extensions:ListBox:RID_PAGE_TABLESELECTION:LB_TABLE 859983362 
+extensions:ListBox:RID_PAGE_TABLESELECTION_AB:LB_TABLELIST 859672065 
 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 
@@ -6543,9 +6638,9 @@ 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:RID_DLG_FORMLINKS 1090158592 
-extensions:ModalDialog:RID_DLG_GRIDWIZARD 1396555776 
-extensions:ModalDialog:RID_DLG_GROUPBOXWIZARD 1396523008 
-extensions:ModalDialog:RID_DLG_LISTCOMBOWIZARD 1396539392 
+extensions:ModalDialog:RID_DLG_GRIDWIZARD 1396883456 
+extensions:ModalDialog:RID_DLG_GROUPBOXWIZARD 1396850688 
+extensions:ModalDialog:RID_DLG_LISTCOMBOWIZARD 1396867072 
 extensions:ModalDialog:RID_DLG_NEW_DATA_TYPE 1090191360 
 extensions:ModalDialog:RID_DLG_OEMWIZARD 1090519040 
 extensions:ModalDialog:RID_DLG_SELECTION 1090174976 
@@ -6562,51 +6657,51 @@ extensions:PushButton:RID_DLG_OEMWIZARD:PB_PREV 1090523649
 extensions:PushButton:RID_DLG_TABORDER:PB_AUTO_ORDER 1090146819 
 extensions:PushButton:RID_DLG_TABORDER:PB_MOVE_DOWN 1090146818 
 extensions:PushButton:RID_DLG_TABORDER:PB_MOVE_UP 1090146817 
-extensions:PushButton:RID_PAGE_ADMININVOKATION:PB_INVOKE_ADMIN_DIALOG 860639745 
-extensions:PushButton:RID_PAGE_FIELDMAPPING:PB_INVOKE_FIELDS_DIALOG 860672514 
-extensions:PushButton:RID_PAGE_FINAL:PB_BROWSE 860688899 
-extensions:PushButton:RID_PAGE_GROUPRADIOSELECTION:PB_MOVETOLEFT 859673090 
-extensions:PushButton:RID_PAGE_GROUPRADIOSELECTION:PB_MOVETORIGHT 859673089 
-extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSLEFT 859804166 
-extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSRIGHT 859804164 
-extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDLEFT 859804165 
-extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDRIGHT 859804163 
-extensions:PushButton:RID_PAGE_TABLESELECTION:PB_FORMDATASOURCE 859656711 
+extensions:PushButton:RID_PAGE_ADMININVOKATION:PB_INVOKE_ADMIN_DIALOG 859656705 
+extensions:PushButton:RID_PAGE_FIELDMAPPING:PB_INVOKE_FIELDS_DIALOG 859689474 
+extensions:PushButton:RID_PAGE_FINAL:PB_BROWSE 859705859 
+extensions:PushButton:RID_PAGE_GROUPRADIOSELECTION:PB_MOVETOLEFT 860000770 
+extensions:PushButton:RID_PAGE_GROUPRADIOSELECTION:PB_MOVETORIGHT 860000769 
+extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSLEFT 860131846 
+extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSRIGHT 860131844 
+extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDLEFT 860131845 
+extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDRIGHT 860131843 
+extensions:PushButton:RID_PAGE_TABLESELECTION:PB_FORMDATASOURCE 859984391 
 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: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 
-extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_YES 859718147 
-extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION 860619267 
-extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION_GROUPWISE 860619274 
-extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION_LDAP 860619275 
-extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_KAB 860619268 
-extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP 860619270 
-extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MACAB 860619269 
-extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK 860619265 
-extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OTHER 860619273 
-extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK 860619271 
-extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOKEXPRESS 860619272 
-extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD 860619266 
-extensions:TabPage:RID_PAGE_ADMININVOKATION 860635136 
-extensions:TabPage:RID_PAGE_DEFAULTFIELDSELECTION 859684864 
-extensions:TabPage:RID_PAGE_FIELDMAPPING 860667904 
-extensions:TabPage:RID_PAGE_FINAL 860684288 
-extensions:TabPage:RID_PAGE_FORM_DATASOURCE_STATUS 859815936 
-extensions:TabPage:RID_PAGE_GROUPRADIOSELECTION 859668480 
-extensions:TabPage:RID_PAGE_GW_FIELDSELECTION 859799552 
-extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_FIELD 859766784 
-extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_TABLE 859750400 
-extensions:TabPage:RID_PAGE_LCW_FIELDLINK 859783168 
-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 859652096 
-extensions:TabPage:RID_PAGE_TABLESELECTION_AB 860651520 
+extensions:RadioButton:RID_PAGE_DEFAULTFIELDSELECTION:RB_DEFSELECTION_NO 860013058 
+extensions:RadioButton:RID_PAGE_DEFAULTFIELDSELECTION:RB_DEFSELECTION_YES 860013057 
+extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_NO 860045828 
+extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_YES 860045827 
+extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION 859636227 
+extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION_GROUPWISE 859636234 
+extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION_LDAP 859636235 
+extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_KAB 859636228 
+extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP 859636230 
+extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MACAB 859636229 
+extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK 859636225 
+extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OTHER 859636233 
+extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK 859636231 
+extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOKEXPRESS 859636232 
+extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD 859636226 
+extensions:TabPage:RID_PAGE_ADMININVOKATION 859652096 
+extensions:TabPage:RID_PAGE_DEFAULTFIELDSELECTION 860012544 
+extensions:TabPage:RID_PAGE_FIELDMAPPING 859684864 
+extensions:TabPage:RID_PAGE_FINAL 859701248 
+extensions:TabPage:RID_PAGE_FORM_DATASOURCE_STATUS 860143616 
+extensions:TabPage:RID_PAGE_GROUPRADIOSELECTION 859996160 
+extensions:TabPage:RID_PAGE_GW_FIELDSELECTION 860127232 
+extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_FIELD 860094464 
+extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_TABLE 860078080 
+extensions:TabPage:RID_PAGE_LCW_FIELDLINK 860110848 
+extensions:TabPage:RID_PAGE_OPTIONS_FINAL 860061696 
+extensions:TabPage:RID_PAGE_OPTIONVALUES 860028928 
+extensions:TabPage:RID_PAGE_OPTION_DBFIELD 860045312 
+extensions:TabPage:RID_PAGE_SELECTABTYPE 859635712 
+extensions:TabPage:RID_PAGE_TABLESELECTION 859979776 
+extensions:TabPage:RID_PAGE_TABLESELECTION_AB 859668480 
 extensions:TabPage:RID_TP_LICENSE 553664512 
 extensions:TabPage:RID_TP_WELCOME 553697280 
 filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_ALL 1090520065 
@@ -6951,7 +7046,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 
@@ -6961,7 +7056,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 
@@ -7077,8 +7172,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 
@@ -7090,8 +7185,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 
@@ -7249,10 +7344,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 
@@ -7311,12 +7407,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 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 
 sc:PushButton:RID_SCPAGE_USERLISTS:BTN_ADD 956846594 
 sc:PushButton:RID_SCPAGE_USERLISTS:BTN_COPY 956846596 
 sc:PushButton:RID_SCPAGE_USERLISTS:BTN_NEW 956846593 
@@ -7382,8 +7480,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 
@@ -7991,6 +8089,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 
@@ -7999,7 +8098,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 
@@ -8601,6 +8700,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 
@@ -8756,6 +8856,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 
@@ -8797,6 +8898,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 
@@ -9033,6 +9135,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 
@@ -9817,7 +9921,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 
@@ -9840,7 +9943,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 
@@ -10020,8 +10122,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