Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101': (76 commits)
masterfix DEV300: #i10000# usage of L10N build_type
removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
hr75: #i116747#: remove obsolete copyright notices
gnumake3: remove comphelper version; fix including extract.hxx
removetooltypes01: #i112600# Replace missing tools types replacement
removetooltypes01: #i112600# remove tooltypes from reportdesign
removetooltypes01: #i112600# remove tooltypes from dbaccess
undoapi: don't use deprecated JUnit API, this seems to fail now (but didn't before the rebase)
undoapi: those two classes do not belong into JAVATESTFILES, but JAVAFILES only
undoapi: (I|Sfx)UndoManager now working with size_t instead of USHORT
gridsort: give the UnoControl(Model/Base) classes a ctor taking a service factory, so we have access to the factory which created us, and don't need to resort to the process'es service factory
dba34b: #109956# notify column value in correct order
dba34b: #i114309# set default values for bit boolean and reset when we are on the insertrow
undoapi: assert unknown slots in ImplInvalidateFeature
dba34b: #i110907# check if design handle event
dba34b: #i109956# notify column values when row is refreshed
dba34b: #i115753# add test again
undoapi: renamed Undo.* to RptUndo.*, to not confuse a certain IDE with different same-named files in the source tree ...
undoapi: migrated report designer to use an own, model-bound UndoManager, instead of the UndoManager formerly bound to the controller
undoapi: split OSingleDocumentController into DBSubComponentController (which the report design's controller will be derived from) and the still-so-named OSingleDocumentController. Module reportdesign does not compile with this change, this is yet to come.
...

Conflicts:
dbaccess/inc/IEnvironment.hxx
dbaccess/inc/dataview.hxx
dbaccess/qa/complex/dbaccess/RowSet.java
dbaccess/source/core/api/CacheSet.cxx
dbaccess/source/core/api/KeySet.hxx
dbaccess/source/core/api/OptimisticSet.hxx
dbaccess/source/core/api/RowSet.cxx
dbaccess/source/core/api/RowSetCache.cxx
dbaccess/source/ext/adabas/Acomponentmodule.cxx
dbaccess/source/ext/adabas/Aservices.cxx
dbaccess/source/filter/migration/cfgimport.cxx
dbaccess/source/filter/migration/cfgimport.hxx
dbaccess/source/filter/migration/cfgservices.cxx
dbaccess/source/filter/migration/makefile.mk
dbaccess/source/inc/cfg_reghelper.hxx
dbaccess/source/sdbtools/misc/sdbt_services.cxx
dbaccess/source/shared/cfg_reghelper.cxx
dbaccess/source/shared/cfgstrings.cxx
dbaccess/source/shared/registrationhelper.cxx
dbaccess/source/ui/app/AppController.cxx
dbaccess/source/ui/app/AppDetailPageHelper.cxx
dbaccess/source/ui/app/AppDetailPageHelper.hxx
dbaccess/source/ui/app/AppDetailView.cxx
dbaccess/source/ui/app/AppIconControl.cxx
dbaccess/source/ui/app/AppSwapWindow.cxx
dbaccess/source/ui/browser/brwctrlr.cxx
dbaccess/source/ui/browser/dataview.cxx
dbaccess/source/ui/browser/unodatbr.cxx
dbaccess/source/ui/control/dbtreelistbox.cxx
dbaccess/source/ui/control/opendoccontrols.cxx
dbaccess/source/ui/control/tabletree.cxx
dbaccess/source/ui/dlg/ConnectionHelper.cxx
dbaccess/source/ui/dlg/ConnectionPage.src
dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
dbaccess/source/ui/dlg/ExtensionNotPresent.src
dbaccess/source/ui/dlg/TablesSingleDlg.cxx
dbaccess/source/ui/dlg/adodatalinks.hxx
dbaccess/source/ui/dlg/dbadmin2.src
dbaccess/source/ui/dlg/dbadminsetup.src
dbaccess/source/ui/dlg/dlgattr.cxx
dbaccess/source/ui/dlg/dlgsize.src
dbaccess/source/ui/dlg/makefile.mk
dbaccess/source/ui/dlg/sqlmessage.cxx
dbaccess/source/ui/inc/ExtensionNotPresent.hxx
dbaccess/source/ui/inc/TokenWriter.hxx
dbaccess/source/ui/inc/imageprovider.hxx
dbaccess/source/ui/misc/DExport.cxx
dbaccess/source/ui/misc/HtmlReader.cxx
dbaccess/source/ui/misc/RowSetDrop.cxx
dbaccess/source/ui/misc/RtfReader.cxx
dbaccess/source/ui/misc/TokenWriter.cxx
dbaccess/source/ui/misc/imageprovider.cxx
dbaccess/source/ui/misc/linkeddocuments.cxx
dbaccess/source/ui/misc/singledoccontroller.cxx
dbaccess/source/ui/querydesign/ConnectionData.hxx
dbaccess/source/ui/querydesign/JoinTableView.cxx
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
dbaccess/source/ui/querydesign/TableConnectionData.cxx
dbaccess/source/ui/querydesign/TableWindowListBox.cxx
dbaccess/source/ui/relationdesign/RelationController.cxx
dbaccess/source/ui/relationdesign/RelationTableView.cxx
dbaccess/source/ui/tabledesign/table.src
reportdesign/inc/RptPage.hxx
reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
reportdesign/source/core/api/ReportDefinition.cxx
reportdesign/source/core/sdr/ReportUndoFactory.cxx
reportdesign/source/core/sdr/UndoEnv.cxx
reportdesign/source/filter/xml/xmlservices.cxx
reportdesign/source/ui/dlg/GroupsSorting.cxx
reportdesign/source/ui/dlg/Navigator.cxx
reportdesign/source/ui/inspection/metadata.cxx
reportdesign/source/ui/misc/RptUndo.cxx
reportdesign/source/ui/misc/UITools.cxx
reportdesign/source/ui/misc/rptuiservices.cxx
reportdesign/source/ui/report/DesignView.cxx
reportdesign/source/ui/report/FixedTextColor.cxx
reportdesign/source/ui/report/ReportController.cxx
reportdesign/source/ui/report/ReportSection.cxx
reportdesign/source/ui/report/SectionView.cxx
reportdesign/source/ui/report/SectionWindow.cxx
reportdesign/source/ui/report/StartMarker.cxx
reportdesign/source/ui/report/ViewsWindow.cxx
reportdesign/source/ui/report/dlgedfunc.cxx
reportdesign/source/ui/report/report.src

1 files changed, 83 insertions, 91 deletions

diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc
index f73782a1d8d4..7b543169e032 100644
--- a/reportdesign/inc/helpids.hrc
+++ b/reportdesign/inc/helpids.hrc
@@ -27,104 +27,96 @@
 #ifndef RTPUI_REPORTDESIGN_HELPID_HRC
 #define RTPUI_REPORTDESIGN_HELPID_HRC
 
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc>    // HID_RPT_DBACCESS_START
-#endif
+#define UID_RPT_PROP_FORMULA                    "REPORTDESIGN_UID_RPT_PROP_FORMULA"
+#define UID_RPT_RPT_PROP_DLG_FONT_TYPE          "REPORTDESIGN_UID_RPT_RPT_PROP_DLG_FONT_TYPE"
+#define UID_RPT_RPT_PROP_DLG_AREA               "REPORTDESIGN_UID_RPT_RPT_PROP_DLG_AREA"
+#define UID_RPT_PROP_CHARTTYPE_DLG              "REPORTDESIGN_UID_RPT_PROP_CHARTTYPE_DLG"
+#define UID_RPT_PROP_DLG_LINKFIELDS             "REPORTDESIGN_UID_RPT_PROP_DLG_LINKFIELDS"
 
-#define UID_RPT_RPT_APP_VIEW        (HID_RPT_START +  0)
-#define UID_RPT_SCROLLWINDOW        (HID_RPT_START +  1)
-#define UID_RPT_REPORTWINDOW        (HID_RPT_START +  2)
-#define HID_RPT_HORZ_RULER          (HID_RPT_START +  3)
-#define UID_RPT_SECTIONSWINDOW      (HID_RPT_START +  4)
-#define UID_RPT_VIEWSWINDOW         (HID_RPT_START +  5)
-#define HID_RPT_ENDMARKER           (HID_RPT_START +  6)
-#define HID_RPT_SPLITTER            (HID_RPT_START +  7)
-#define HID_REPORTSECTION       (HID_RPT_START +  8)
-#define HID_RPT_HORZ_SCROLLBAR      (HID_RPT_START +  9)
-#define HID_RPT_VERT_SCROLLBAR      (HID_RPT_START +  10)
-#define HID_RPT_STARTMARKER         (HID_RPT_START +  11)
-#define HID_RPT_FIELDEXPRESSION     (HID_RPT_START +  12)
-#define HID_RPT_SORTORDER           (HID_RPT_START +  13)
-#define HID_RPT_GROUPSBRW           (HID_RPT_START +  14)
-#define HID_RPT_GROUPSSORTING_DLG   (HID_RPT_START +  15)
-#define HID_RPT_PAGENUMBERS_DLG     (HID_RPT_START +  16)
-#define HID_RPT_DATETIME_DLG        (HID_RPT_START +  17)
-#define HID_RPT_CONDFORMAT_DLG      (HID_RPT_START +  18)
-#define HID_RPT_CONDFORMAT_TB       (HID_RPT_START +  19)
-#define HID_RPT_CRTL_FORMAT_PREVIEW (HID_RPT_START +  20)
-#define HID_RPT_COND_DLG            (HID_RPT_START +  21)
-#define HID_RPT_POPUP_COLOR_CTRL    (HID_RPT_START +  22)
-#define HID_RPT_POPUP_COLOR         (HID_RPT_START +  23)
-#define HID_RPT_FIELD_SEL           (HID_RPT_START +  24)
-#define HID_RPT_FIELD_SEL_WIN       (HID_RPT_START +  25)
-#define HID_RPT_PROPDLG_TAB_GENERAL (HID_RPT_START +  26)
-#define HID_RPT_PROPDLG_TAB_DATA    (HID_RPT_START +  27)
+#define UID_RPT_RPT_APP_VIEW                          "REPORTDESIGN_UID_RPT_RPT_APP_VIEW"
+#define UID_RPT_SCROLLWINDOW                          "REPORTDESIGN_UID_RPT_SCROLLWINDOW"
+#define UID_RPT_REPORTWINDOW                          "REPORTDESIGN_UID_RPT_REPORTWINDOW"
+#define HID_RPT_HORZ_RULER                            "REPORTDESIGN_HID_RPT_HORZ_RULER"
+#define UID_RPT_SECTIONSWINDOW                        "REPORTDESIGN_UID_RPT_SECTIONSWINDOW"
+#define UID_RPT_VIEWSWINDOW                           "REPORTDESIGN_UID_RPT_VIEWSWINDOW"
+#define HID_RPT_ENDMARKER                             "REPORTDESIGN_HID_RPT_ENDMARKER"
+#define HID_RPT_SPLITTER                              "REPORTDESIGN_HID_RPT_SPLITTER"
+#define HID_REPORTSECTION                             "REPORTDESIGN_HID_REPORTSECTION"
+#define HID_RPT_HORZ_SCROLLBAR                        "REPORTDESIGN_HID_RPT_HORZ_SCROLLBAR"
+#define HID_RPT_VERT_SCROLLBAR                        "REPORTDESIGN_HID_RPT_VERT_SCROLLBAR"
+#define HID_RPT_STARTMARKER                           "REPORTDESIGN_HID_RPT_STARTMARKER"
+#define HID_RPT_FIELDEXPRESSION                       "REPORTDESIGN_HID_RPT_FIELDEXPRESSION"
+#define HID_RPT_SORTORDER                             "REPORTDESIGN_HID_RPT_SORTORDER"
+#define HID_RPT_GROUPSBRW                             "REPORTDESIGN_HID_RPT_GROUPSBRW"
+#define HID_RPT_GROUPSSORTING_DLG                     "REPORTDESIGN_HID_RPT_GROUPSSORTING_DLG"
+#define HID_RPT_PAGENUMBERS_DLG                       "REPORTDESIGN_HID_RPT_PAGENUMBERS_DLG"
+#define HID_RPT_DATETIME_DLG                          "REPORTDESIGN_HID_RPT_DATETIME_DLG"
+#define HID_RPT_CONDFORMAT_DLG                        "REPORTDESIGN_HID_RPT_CONDFORMAT_DLG"
+#define HID_RPT_CONDFORMAT_TB                         "REPORTDESIGN_HID_RPT_CONDFORMAT_TB"
+#define HID_RPT_CRTL_FORMAT_PREVIEW                   "REPORTDESIGN_HID_RPT_CRTL_FORMAT_PREVIEW"
+#define HID_RPT_COND_DLG                              "REPORTDESIGN_HID_RPT_COND_DLG"
+#define HID_RPT_POPUP_COLOR_CTRL                      "REPORTDESIGN_HID_RPT_POPUP_COLOR_CTRL"
+#define HID_RPT_POPUP_COLOR                           "REPORTDESIGN_HID_RPT_POPUP_COLOR"
+#define HID_RPT_FIELD_SEL                             "REPORTDESIGN_HID_RPT_FIELD_SEL"
+#define HID_RPT_FIELD_SEL_WIN                         "REPORTDESIGN_HID_RPT_FIELD_SEL_WIN"
+#define HID_RPT_PROPDLG_TAB_GENERAL                   "REPORTDESIGN_HID_RPT_PROPDLG_TAB_GENERAL"
+#define HID_RPT_PROPDLG_TAB_DATA                      "REPORTDESIGN_HID_RPT_PROPDLG_TAB_DATA"
 
-#define HID_RPT_PROP_FORCENEWPAGE               (HID_RPT_START + 28)
-#define HID_RPT_PROP_NEWROWORCOL                (HID_RPT_START + 29)
-#define HID_RPT_PROP_KEEPTOGETHER               (HID_RPT_START + 30)
-#define HID_RPT_PROP_CANGROW                    (HID_RPT_START + 31)
-#define HID_RPT_PROP_CANSHRINK                  (HID_RPT_START + 32)
-#define HID_RPT_PROP_REPEATSECTION              (HID_RPT_START + 33)
-#define HID_RPT_PROP_FORMULALIST                (HID_RPT_START + 34)
-#define HID_RPT_PROP_SCOPE                      (HID_RPT_START + 35)
-#define HID_RPT_PROP_TYPE                       (HID_RPT_START + 36)
-#define HID_RPT_PROP_MASTERFIELDS               (HID_RPT_START + 37)
-#define HID_RPT_PROP_DETAILFIELDS               (HID_RPT_START + 38)
-#define HID_RPT_PROP_AREA                       (HID_RPT_START + 39)
-#define UID_RPT_RPT_PROP_DLG_AREA               (HID_RPT_START + 40)
-#define HID_RPT_PROP_MIMETYPE                   (HID_RPT_START + 41)
+#define HID_RPT_PROP_FORCENEWPAGE                     "REPORTDESIGN_HID_RPT_PROP_FORCENEWPAGE"
+#define HID_RPT_PROP_NEWROWORCOL                      "REPORTDESIGN_HID_RPT_PROP_NEWROWORCOL"
+#define HID_RPT_PROP_KEEPTOGETHER                     "REPORTDESIGN_HID_RPT_PROP_KEEPTOGETHER"
+#define HID_RPT_PROP_CANGROW                          "REPORTDESIGN_HID_RPT_PROP_CANGROW"
+#define HID_RPT_PROP_CANSHRINK                        "REPORTDESIGN_HID_RPT_PROP_CANSHRINK"
+#define HID_RPT_PROP_REPEATSECTION                    "REPORTDESIGN_HID_RPT_PROP_REPEATSECTION"
+#define HID_RPT_PROP_FORMULALIST                      "REPORTDESIGN_HID_RPT_PROP_FORMULALIST"
+#define HID_RPT_PROP_SCOPE                            "REPORTDESIGN_HID_RPT_PROP_SCOPE"
+#define HID_RPT_PROP_TYPE                             "REPORTDESIGN_HID_RPT_PROP_TYPE"
+#define HID_RPT_PROP_MASTERFIELDS                     "REPORTDESIGN_HID_RPT_PROP_MASTERFIELDS"
+#define HID_RPT_PROP_DETAILFIELDS                     "REPORTDESIGN_HID_RPT_PROP_DETAILFIELDS"
+#define HID_RPT_PROP_AREA                             "REPORTDESIGN_HID_RPT_PROP_AREA"
+#define HID_RPT_PROP_MIMETYPE                         "REPORTDESIGN_HID_RPT_PROP_MIMETYPE"
 // free
 // free
-#define HID_RPT_PROP_PRINTREPEATEDVALUES        (HID_RPT_START + 44)
-#define HID_RPT_PROP_CONDITIONALPRINTEXPRESSION (HID_RPT_START + 45)
-#define HID_RPT_PROP_VERTICALALIGN              (HID_RPT_START + 46)
-#define HID_RPT_PROP_STARTNEWCOLUMN             (HID_RPT_START + 47)
-#define HID_RPT_PROP_STARTNEWPAGE               (HID_RPT_START + 48)
-#define HID_RPT_PROP_RESETPAGENUMBER            (HID_RPT_START + 49)
-#define HID_RPT_PROP_PARAADJUST                 (HID_RPT_START + 50)
-#define HID_RPT_PROP_MINHEIGHTNEWPAGE           (HID_RPT_START + 51)
-#define HID_RPT_PROP_PRINTWHENGROUPCHANGE       (HID_RPT_START + 52)
-#define HID_RPT_PROP_CHARTTYPE                  (HID_RPT_START + 53)
+#define HID_RPT_PROP_PRINTREPEATEDVALUES              "REPORTDESIGN_HID_RPT_PROP_PRINTREPEATEDVALUES"
+#define HID_RPT_PROP_CONDITIONALPRINTEXPRESSION       "REPORTDESIGN_HID_RPT_PROP_CONDITIONALPRINTEXPRESSION"
+#define HID_RPT_PROP_VERTICALALIGN                    "REPORTDESIGN_HID_RPT_PROP_VERTICALALIGN"
+#define HID_RPT_PROP_STARTNEWCOLUMN                   "REPORTDESIGN_HID_RPT_PROP_STARTNEWCOLUMN"
+#define HID_RPT_PROP_STARTNEWPAGE                     "REPORTDESIGN_HID_RPT_PROP_STARTNEWPAGE"
+#define HID_RPT_PROP_RESETPAGENUMBER                  "REPORTDESIGN_HID_RPT_PROP_RESETPAGENUMBER"
+#define HID_RPT_PROP_PARAADJUST                       "REPORTDESIGN_HID_RPT_PROP_PARAADJUST"
+#define HID_RPT_PROP_MINHEIGHTNEWPAGE                 "REPORTDESIGN_HID_RPT_PROP_MINHEIGHTNEWPAGE"
+#define HID_RPT_PROP_PRINTWHENGROUPCHANGE             "REPORTDESIGN_HID_RPT_PROP_PRINTWHENGROUPCHANGE"
+#define HID_RPT_PROP_CHARTTYPE                        "REPORTDESIGN_HID_RPT_PROP_CHARTTYPE"
 // free
 // free
-#define HID_RPT_PROP_VISIBLE                    (HID_RPT_START + 55)
-#define HID_RPT_PROP_GROUPKEEPTOGETHER          (HID_RPT_START + 56)
-#define HID_RPT_PROP_PAGEHEADEROPTION           (HID_RPT_START + 57)
-#define HID_RPT_PROP_PAGEFOOTEROPTION           (HID_RPT_START + 58)
-#define UID_RPT_PROP_DLG_LINE_STYLE             (HID_RPT_START + 59)
-#define HID_RPT_PROP_PREVIEW_COUNT              (HID_RPT_START + 60)
-#define HID_RPT_PROP_DATAFIELD                  (HID_RPT_START + 61)
-#define HID_RPT_PROP_BACKCOLOR                  (HID_RPT_START + 62)
-#define HID_RPT_PROP_RPT_POSITIONX              (HID_RPT_START + 63)
-#define HID_RPT_PROP_RPT_POSITIONY              (HID_RPT_START + 64)
-#define HID_RPT_PROP_RPT_WIDTH                  (HID_RPT_START + 65)
-#define HID_RPT_PROP_RPT_HEIGHT                 (HID_RPT_START + 66)
-#define HID_RPT_START_TITLE                     (HID_RPT_START + 67)
-#define HID_RPT_START_IMAGE                     (HID_RPT_START + 68)
-#define HID_RPT_PROP_DEEPTRAVERSING             (HID_RPT_START + 69)
-#define HID_RPT_PROP_PREEVALUATED               (HID_RPT_START + 70)
-#define HID_RPT_NAVIGATOR_DLG                   (HID_RPT_START + 71)
-#define HID_REPORT_NAVIGATOR_TREE               (HID_RPT_START + 72)
-#define HID_RPT_PROP_FORMULA                    (HID_RPT_START + 73)
-#define HID_RPT_PROP_INITIALFORMULA             (HID_RPT_START + 74)
-#define HID_RPT_PROP_RPT_FONT                   (HID_RPT_START + 75)
-#define UID_RPT_RPT_PROP_DLG_FONT_TYPE          (HID_RPT_START + 76)
-#define HID_RPT_PROP_PRESERVEIRI                (HID_RPT_START + 77)
-#define HID_RPT_PROP_BACKTRANSPARENT            (HID_RPT_START + 78)
-#define HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT (HID_RPT_START + 79)
-#define UID_RPT_PROP_CHARTTYPE_DLG              (HID_RPT_START + 80)
-#define UID_RPT_PROP_DLG_LINKFIELDS             (HID_RPT_START + 81)
-#define UID_RPT_PROP_FORMULA                    (HID_RPT_START + 82)
+#define HID_RPT_PROP_VISIBLE                          "REPORTDESIGN_HID_RPT_PROP_VISIBLE"
+#define HID_RPT_PROP_GROUPKEEPTOGETHER                "REPORTDESIGN_HID_RPT_PROP_GROUPKEEPTOGETHER"
+#define HID_RPT_PROP_PAGEHEADEROPTION                 "REPORTDESIGN_HID_RPT_PROP_PAGEHEADEROPTION"
+#define HID_RPT_PROP_PAGEFOOTEROPTION                 "REPORTDESIGN_HID_RPT_PROP_PAGEFOOTEROPTION"
+#define UID_RPT_PROP_DLG_LINE_STYLE                   "REPORTDESIGN_UID_RPT_PROP_DLG_LINE_STYLE"
+#define HID_RPT_PROP_PREVIEW_COUNT                    "REPORTDESIGN_HID_RPT_PROP_PREVIEW_COUNT"
+#define HID_RPT_PROP_DATAFIELD                        "REPORTDESIGN_HID_RPT_PROP_DATAFIELD"
+#define HID_RPT_PROP_BACKCOLOR                        "REPORTDESIGN_HID_RPT_PROP_BACKCOLOR"
+#define HID_RPT_PROP_RPT_POSITIONX                    "REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONX"
+#define HID_RPT_PROP_RPT_POSITIONY                    "REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONY"
+#define HID_RPT_PROP_RPT_WIDTH                        "REPORTDESIGN_HID_RPT_PROP_RPT_WIDTH"
+#define HID_RPT_PROP_RPT_HEIGHT                       "REPORTDESIGN_HID_RPT_PROP_RPT_HEIGHT"
+#define HID_RPT_START_TITLE                           "REPORTDESIGN_HID_RPT_START_TITLE"
+#define HID_RPT_START_IMAGE                           "REPORTDESIGN_HID_RPT_START_IMAGE"
+#define HID_RPT_PROP_DEEPTRAVERSING                   "REPORTDESIGN_HID_RPT_PROP_DEEPTRAVERSING"
+#define HID_RPT_PROP_PREEVALUATED                     "REPORTDESIGN_HID_RPT_PROP_PREEVALUATED"
+#define HID_RPT_NAVIGATOR_DLG                         "REPORTDESIGN_HID_RPT_NAVIGATOR_DLG"
+#define HID_REPORT_NAVIGATOR_TREE                     "REPORTDESIGN_HID_REPORT_NAVIGATOR_TREE"
+#define HID_RPT_PROP_FORMULA                          "REPORTDESIGN_HID_RPT_PROP_FORMULA"
+#define HID_RPT_PROP_INITIALFORMULA                   "REPORTDESIGN_HID_RPT_PROP_INITIALFORMULA"
+#define HID_RPT_PROP_RPT_FONT                         "REPORTDESIGN_HID_RPT_PROP_RPT_FONT"
+#define HID_RPT_PROP_PRESERVEIRI                      "REPORTDESIGN_HID_RPT_PROP_PRESERVEIRI"
+#define HID_RPT_PROP_BACKTRANSPARENT                  "REPORTDESIGN_HID_RPT_PROP_BACKTRANSPARENT"
+#define HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT     "REPORTDESIGN_HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT"
 
-#define HID_RPT_GROUPSORT_MOVE_UP               (HID_RPT_START + 82)
-#define HID_RPT_GROUPSORT_MOVE_DOWN                 (HID_RPT_START + 83)
-#define HID_RPT_GROUPSORT_DELETE                (HID_RPT_START + 84)
-
-#if UID_RPT_PROP_FORMULA > HID_RPT_END
-#error Help-Id Ueberlauf in #file, #line
-#endif
-// don't forget to update the file util/hidother.src
+#define HID_RPT_GROUPSORT_MOVE_UP                     "REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_UP"
+#define HID_RPT_GROUPSORT_MOVE_DOWN                   "REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_DOWN"
+#define HID_RPT_GROUPSORT_DELETE                      "REPORTDESIGN_HID_RPT_GROUPSORT_DELETE"
 
 #endif //RTPUI_REPORTDESIGN_HELPID_HRC