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)

2 files changed, 67 insertions, 105 deletions

diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index c7f172cbe5db..b5089d663c72 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -33,106 +33,75 @@
 // include     -----------------------------------------------------------
 #include <svtools/solar.hrc>
 
-// in solar.hrc
-//#define HID_FORMS_START               (HID_LIB_START+4000)
-//#define HID_FORMS_END                 (HID_LIB_START+4999)
-
 // Help-Ids --------------------------------------------------------------
 
-// insgesamt 200
-#define HID_DLG_DBINFO                          (HID_FORMS_START +   0)
-#define HID_DLG_DBMSG                           (HID_FORMS_START +   1)
-
-#define HID_FM_OTHER_START                      (HID_FORMS_START + 300)
-#define HID_FORM_NAVIGATOR                      (HID_FM_OTHER_START +  0)
-#define HID_FORM_NAVIGATOR_WIN                  (HID_FM_OTHER_START +  1)
-#define HID_FIELD_SEL                           (HID_FM_OTHER_START +  2)
-#define HID_FIELD_SEL_WIN                       (HID_FM_OTHER_START +  3)
-#define HID_FILTER_NAVIGATOR                    (HID_FM_OTHER_START +  4)
-#define HID_FILTER_NAVIGATOR_WIN                (HID_FM_OTHER_START +  5)
-
-#define HID_FORM_DLG_START                      (HID_FORMS_START + 400)
-// FREE
-// FREE
-// FREE
-#define HID_FM_PROPDLG_WINDOW                   (HID_FORM_DLG_START +   3)
-#define HID_FM_PROPDLG_CONTAINER                (HID_FORM_DLG_START +   4)
-#define HID_FM_PROPDLG_TABCTR                   (HID_FORM_DLG_START +   5)
-#define HID_FM_PROPDLG_TAB_GENERAL              (HID_FORM_DLG_START +   6)
-#define HID_FM_PROPDLG_TAB_DATA                 (HID_FORM_DLG_START +   7)
-#define HID_FM_PROPDLG_TAB_EVT                  (HID_FORM_DLG_START +   8)
-#define HID_FM_DLG_SEARCH                       (HID_FORM_DLG_START +   9)
-
-#define HID_SEARCH_TEXT                         (HID_FORM_DLG_START +  10)
-#define HID_SEARCH_ALLFIELDS                    (HID_FORM_DLG_START +  11)
-#define HID_SEARCH_SINGLEFIELD                  (HID_FORM_DLG_START +  12)
-#define HID_SEARCH_FIELDSELECTION               (HID_FORM_DLG_START +  13)
-#define HID_SEARCH_POSITION                     (HID_FORM_DLG_START +  14)
-#define HID_SEARCH_FORMATTER                    (HID_FORM_DLG_START +  15)
-#define HID_SEARCH_CASE                         (HID_FORM_DLG_START +  16)
-#define HID_SEARCH_BACKWARD                     (HID_FORM_DLG_START +  17)
-#define HID_SEARCH_STARTOVER                    (HID_FORM_DLG_START +  18)
-#define HID_SEARCH_WILDCARD                     (HID_FORM_DLG_START +  19)
-#define HID_SEARCH_REGULAR                      (HID_FORM_DLG_START +  20)
-#define HID_SEARCH_APPROX                       (HID_FORM_DLG_START +  21)
-#define HID_SEARCH_APPROXSETTINGS               (HID_FORM_DLG_START +  22)
-#define HID_SEARCH_BTN_SEARCH                   (HID_FORM_DLG_START +  23)
-#define HID_SEARCH_BTN_CLOSE                    (HID_FORM_DLG_START +  24)
-
-#define HID_TABORDER_CONTROLS                   (HID_FORM_DLG_START +  25)
-
-#define HID_CONTROLS_DATE_N_TIME                (HID_FORM_DLG_START +  26)
-#define HID_FM_DLG_PARAM                        (HID_FORM_DLG_START +  27)
-
-#define HID_GRID_TRAVEL_FIRST                   (HID_FORM_DLG_START +  28)
-#define HID_GRID_TRAVEL_PREV                    (HID_FORM_DLG_START +  29)
-#define HID_GRID_TRAVEL_NEXT                    (HID_FORM_DLG_START +  30)
-#define HID_GRID_TRAVEL_LAST                    (HID_FORM_DLG_START +  31)
-#define HID_GRID_TRAVEL_NEW                     (HID_FORM_DLG_START +  32)
-#define HID_GRID_TRAVEL_ABSOLUTE                (HID_FORM_DLG_START +  33)
-#define HID_GRID_NUMBEROFRECORDS                (HID_FORM_DLG_START +  34)
-
-#define UID_SEARCH_RECORDSTATUS                 (HID_FORM_DLG_START +  35)
-
-#define UID_FORMPROPBROWSER_FRAME               (HID_FORM_DLG_START +  37)
-#define UID_ABSOLUTE_RECORD_WINDOW              (HID_FORM_DLG_START +  38)
-
-#define HID_DATA_NAVIGATOR_WIN                  (HID_FM_OTHER_START +  39)
-#define HID_XFORMS_ADDDATAITEM_DLG              (HID_FM_OTHER_START +  40)
-#define HID_XFORMS_ADDCONDITION_DLG             (HID_FM_OTHER_START +  41)
-#define HID_XFORMS_NAMESPACEITEM_DLG            (HID_FM_OTHER_START +  42)
-#define HID_XFORMS_NAMESPACEITEM_LIST           (HID_FM_OTHER_START +  43)
-#define HID_XFORMS_MANAGENAMESPACE_DLG          (HID_FM_OTHER_START +  44)
-
-#define HID_TP_XFORMS_INSTANCE                  (HID_FM_OTHER_START +  45)
-#define HID_TP_XFORMS_SUBMISSION                (HID_FM_OTHER_START +  46)
-#define HID_TP_XFORMS_BINDING                   (HID_FM_OTHER_START +  47)
-
-#define HID_MN_XFORMS_MODELS_ADD                (HID_FM_OTHER_START +  48)
-#define HID_MN_XFORMS_MODELS_EDIT               (HID_FM_OTHER_START +  49)
-#define HID_MN_XFORMS_MODELS_REMOVE             (HID_FM_OTHER_START +  50)
-#define HID_MN_XFORMS_INSTANCES_ADD             (HID_FM_OTHER_START +  51)
-#define HID_MN_XFORMS_INSTANCES_EDIT            (HID_FM_OTHER_START +  52)
-#define HID_MN_XFORMS_INSTANCES_REMOVE          (HID_FM_OTHER_START +  53)
-#define HID_MN_XFORMS_SHOW_DETAILS              (HID_FM_OTHER_START +  54)
-#define HID_XFORMS_TOOLBOX                      (HID_FM_OTHER_START +  55)
-#define HID_XFORMS_TOOLBOX_ITEM_ADD             (HID_FM_OTHER_START +  56)
-#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT     (HID_FM_OTHER_START +  57)
-#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE   (HID_FM_OTHER_START +  58)
-#define HID_XFORMS_TOOLBOX_ITEM_EDIT            (HID_FM_OTHER_START +  59)
-#define HID_XFORMS_TOOLBOX_ITEM_REMOVE          (HID_FM_OTHER_START +  60)
-#define HID_XFORMS_ITEMS_LIST                   (HID_FM_OTHER_START +  61)
-#define HID_XFORMS_MODELS_LIST                  (HID_FM_OTHER_START +  62)
-#define HID_XFORMS_MODELS_MENUBTN               (HID_FM_OTHER_START +  63)
-#define HID_XFORMS_INSTANCES_MENUBTN            (HID_FM_OTHER_START +  64)
-#define HID_XFORMS_ADDSUBMISSION_DLG            (HID_FM_OTHER_START +  65)
-#define HID_XFORMS_ADDMODEL_DLG                 (HID_FM_OTHER_START +  66)
-#define HID_XFORMS_ADDINSTANCE_DLG              (HID_FM_OTHER_START +  67)
-#define HID_XFORMS_MID_INSERT_CONTROL           (HID_FM_OTHER_START +  68)
-#define HID_XFORMS_TAB_CONTROL                  (HID_FM_OTHER_START +  69)
-
-// if you add a new define here, please adjust the overflow check
-// at the end of the file!!
+#define HID_DLG_DBMSG                           ( HID_FORMS_START +   1)
+#define HID_FORM_NAVIGATOR                      ( HID_FORMS_START +   2)
+#define HID_FORM_NAVIGATOR_WIN                  ( HID_FORMS_START +   3)
+#define HID_FIELD_SEL                           ( HID_FORMS_START +   4)
+#define HID_FIELD_SEL_WIN                       ( HID_FORMS_START +   5)
+#define HID_FILTER_NAVIGATOR                    ( HID_FORMS_START +   6)
+#define HID_FILTER_NAVIGATOR_WIN                ( HID_FORMS_START +   7)
+#define HID_FM_DLG_SEARCH                       ( HID_FORMS_START +   8)
+#define HID_SEARCH_TEXT                         ( HID_FORMS_START +   9)
+#define HID_SEARCH_ALLFIELDS                    ( HID_FORMS_START +  10)
+#define HID_SEARCH_SINGLEFIELD                  ( HID_FORMS_START +  11)
+#define HID_SEARCH_FIELDSELECTION               ( HID_FORMS_START +  12)
+#define HID_SEARCH_POSITION                     ( HID_FORMS_START +  13)
+#define HID_SEARCH_FORMATTER                    ( HID_FORMS_START +  14)
+#define HID_SEARCH_CASE                         ( HID_FORMS_START +  15)
+#define HID_SEARCH_BACKWARD                     ( HID_FORMS_START +  16)
+#define HID_SEARCH_STARTOVER                    ( HID_FORMS_START +  17)
+#define HID_SEARCH_WILDCARD                     ( HID_FORMS_START +  18)
+#define HID_SEARCH_REGULAR                      ( HID_FORMS_START +  19)
+#define HID_SEARCH_APPROX                       ( HID_FORMS_START +  20)
+#define HID_SEARCH_APPROXSETTINGS               ( HID_FORMS_START +  21)
+#define HID_SEARCH_BTN_SEARCH                   ( HID_FORMS_START +  22)
+#define HID_SEARCH_BTN_CLOSE                    ( HID_FORMS_START +  23)
+#define HID_CONTROLS_DATE_N_TIME                ( HID_FORMS_START +  24)
+#define HID_GRID_TRAVEL_FIRST                   ( HID_FORMS_START +  25)
+#define HID_GRID_TRAVEL_PREV                    ( HID_FORMS_START +  26)
+#define HID_GRID_TRAVEL_NEXT                    ( HID_FORMS_START +  27)
+#define HID_GRID_TRAVEL_LAST                    ( HID_FORMS_START +  28)
+#define HID_GRID_TRAVEL_NEW                     ( HID_FORMS_START +  29)
+#define HID_GRID_TRAVEL_ABSOLUTE                ( HID_FORMS_START +  30)
+#define HID_GRID_NUMBEROFRECORDS                ( HID_FORMS_START +  31)
+#define UID_SEARCH_RECORDSTATUS                 ( HID_FORMS_START +  32)
+#define UID_FORMPROPBROWSER_FRAME               ( HID_FORMS_START +  33)
+#define UID_ABSOLUTE_RECORD_WINDOW              ( HID_FORMS_START +  34)
+#define HID_DATA_NAVIGATOR_WIN                  ( HID_FORMS_START +  35)
+#define HID_XFORMS_ADDDATAITEM_DLG              ( HID_FORMS_START +  36)
+#define HID_XFORMS_ADDCONDITION_DLG             ( HID_FORMS_START +  37)
+#define HID_XFORMS_NAMESPACEITEM_DLG            ( HID_FORMS_START +  38)
+#define HID_XFORMS_NAMESPACEITEM_LIST           ( HID_FORMS_START +  39)
+#define HID_XFORMS_MANAGENAMESPACE_DLG          ( HID_FORMS_START +  40)
+#define HID_TP_XFORMS_INSTANCE                  ( HID_FORMS_START +  41)
+#define HID_TP_XFORMS_SUBMISSION                ( HID_FORMS_START +  42)
+#define HID_TP_XFORMS_BINDING                   ( HID_FORMS_START +  43)
+#define HID_MN_XFORMS_MODELS_ADD                ( HID_FORMS_START +  44)
+#define HID_MN_XFORMS_MODELS_EDIT               ( HID_FORMS_START +  45)
+#define HID_MN_XFORMS_MODELS_REMOVE             ( HID_FORMS_START +  46)
+#define HID_MN_XFORMS_INSTANCES_ADD             ( HID_FORMS_START +  47)
+#define HID_MN_XFORMS_INSTANCES_EDIT            ( HID_FORMS_START +  48)
+#define HID_MN_XFORMS_INSTANCES_REMOVE          ( HID_FORMS_START +  49)
+#define HID_MN_XFORMS_SHOW_DETAILS              ( HID_FORMS_START +  50)
+#define HID_XFORMS_TOOLBOX                      ( HID_FORMS_START +  51)
+#define HID_XFORMS_TOOLBOX_ITEM_ADD             ( HID_FORMS_START +  52)
+#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT     ( HID_FORMS_START +  53)
+#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE   ( HID_FORMS_START +  54)
+#define HID_XFORMS_TOOLBOX_ITEM_EDIT            ( HID_FORMS_START +  55)
+#define HID_XFORMS_TOOLBOX_ITEM_REMOVE          ( HID_FORMS_START +  56)
+#define HID_XFORMS_ITEMS_LIST                   ( HID_FORMS_START +  57)
+#define HID_XFORMS_MODELS_LIST                  ( HID_FORMS_START +  58)
+#define HID_XFORMS_MODELS_MENUBTN               ( HID_FORMS_START +  59)
+#define HID_XFORMS_INSTANCES_MENUBTN            ( HID_FORMS_START +  60)
+#define HID_XFORMS_ADDSUBMISSION_DLG            ( HID_FORMS_START +  61)
+#define HID_XFORMS_ADDMODEL_DLG                 ( HID_FORMS_START +  62)
+#define HID_XFORMS_ADDINSTANCE_DLG              ( HID_FORMS_START +  63)
+#define HID_XFORMS_MID_INSERT_CONTROL           ( HID_FORMS_START +  64)
+#define HID_XFORMS_TAB_CONTROL                  ( HID_FORMS_START +  65)
+    // if you add a new define here, please adjust the overflow check
+    // at the end of the file!!
 
 
 // -----------------------------------------------------------------------
diff --git a/svx/util/hidother.src b/svx/util/hidother.src
index 6ef00e2640a2..9f1a665b4061 100644
--- a/svx/util/hidother.src
+++ b/svx/util/hidother.src
@@ -71,11 +71,6 @@ hidspecial HID_FIELD_SEL_WIN                { HelpID =HID_FIELD_SEL_WIN
 hidspecial HID_FILTER_NAVIGATOR             { HelpID =HID_FILTER_NAVIGATOR      ;};
 hidspecial HID_FILTER_NAVIGATOR_WIN         { HelpID =HID_FILTER_NAVIGATOR_WIN  ;};
 
-hidspecial HID_FM_PROPDLG_TABCTR            { HelpID =HID_FM_PROPDLG_TABCTR     ;};
-hidspecial HID_FM_PROPDLG_TAB_GENERAL       { HelpID =HID_FM_PROPDLG_TAB_GENERAL;};
-hidspecial HID_FM_PROPDLG_TAB_DATA          { HelpID =HID_FM_PROPDLG_TAB_DATA   ;};
-hidspecial HID_FM_PROPDLG_TAB_EVT           { HelpID =HID_FM_PROPDLG_TAB_EVT    ;};
-
 hidspecial HID_VALUESET_SINGLENUM           { HelpID = HID_VALUESET_SINGLENUM ;};
 hidspecial HID_VALUESET_BULLET              { HelpID = HID_VALUESET_BULLET   ;};
 hidspecial HID_VALUESET_NUM                 { HelpID = HID_VALUESET_NUM      ;};
@@ -88,8 +83,6 @@ hidspecial HID_TPPAGE_FULLSIZE              { HelpId = HID_TPPAGE_FULLSIZE
 hidspecial HID_OPTINET2_CTL_COOKIES         { HelpId = HID_OPTINET2_CTL_COOKIES ;};
 hidspecial HID_OPTPATH_CTL_PATH             { HelpId = HID_OPTPATH_CTL_PATH     ;};
 
-hidspecial HID_TABORDER_CONTROLS            { HelpId = HID_TABORDER_CONTROLS    ;};
-
 hidspecial HID_POPUP_LINEEND                { HelpId = HID_POPUP_LINEEND            ;};
 hidspecial HID_POPUP_LINEEND_CTRL           { HelpId = HID_POPUP_LINEEND_CTRL       ;};