Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101': (185 commits)
masterfix DEV300: #i10000# usage of L10N build_type
masterfix: #i10000# INT16 -> sal_Int16
fixed compile errors after resync to m100, part2
gridsort: post-rebase fixes
CWS gnumake3: found another tools integer type
removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
native359: #i114398# changing mac langpack icon
native359: #i115669# fixing package description for solaris packages
gnumake3: remove comphelper version; fix including extract.hxx
locales34: #i106785# add Haitian_Haiti [ht-HT] to language list and locale data; locale data contributed by <jcpoulard>
sb138: #i116659# timely termination of OnLogRotateThread
accfixes: removed include of obsolete header file
accfixes: removed obsolete file
removetooltypes01: #i112600# Fix build problems on non-pro
accfixes: moved some shared strings to svx part2
accfixes: moved some shared strings to svx
accfixes: added more accessibility information and fixed tab orders in multiple dialogs (cui module)
removetooltypes01: #i112600# Remove tools types for Mac specific parts
fixed tab order in BasicIDE, Library dialog tab page
added some accessible names in BasicIDE
...

Conflicts:
UnoControls/source/base/registercontrols.cxx
accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
automation/inc/automation/communi.hxx
automation/inc/automation/simplecm.hxx
automation/source/communi/communi.cxx
automation/source/inc/rcontrol.hxx
automation/source/miniapp/servuid.hxx
automation/source/server/XMLParser.cxx
automation/source/server/cmdbasestream.cxx
automation/source/server/profiler.hxx
automation/source/server/recorder.cxx
automation/source/server/retstrm.hxx
automation/source/server/server.cxx
automation/source/server/sta_list.cxx
automation/source/server/statemnt.cxx
automation/source/server/statemnt.hxx
automation/source/simplecm/packethandler.cxx
automation/source/simplecm/simplecm.cxx
automation/source/simplecm/tcpio.cxx
automation/source/simplecm/tcpio.hxx
automation/source/testtool/comm_bas.hxx
automation/source/testtool/cretstrm.hxx
automation/source/testtool/httprequest.cxx
automation/source/testtool/httprequest.hxx
automation/source/testtool/objtest.cxx
automation/source/testtool/objtest.hxx
basctl/source/basicide/baside2.cxx
basctl/source/basicide/baside2.hxx
basctl/source/basicide/baside2b.cxx
basctl/source/basicide/baside3.cxx
basctl/source/basicide/basides1.cxx
basctl/source/basicide/basides2.cxx
basctl/source/basicide/basidesh.cxx
basctl/source/basicide/basidesh.src
basctl/source/basicide/basobj3.cxx
basctl/source/basicide/bastype2.cxx
basctl/source/basicide/bastype3.cxx
basctl/source/basicide/bastypes.cxx
basctl/source/basicide/brkdlg.cxx
basctl/source/basicide/iderdll.cxx
basctl/source/basicide/macrodlg.cxx
basctl/source/basicide/moduldl2.cxx
basctl/source/basicide/moduldlg.cxx
basctl/source/basicide/objdlg.cxx
basctl/source/basicide/scriptdocument.cxx
basctl/source/basicide/tbxctl.cxx
basctl/source/basicide/tbxctl.hxx
basctl/source/basicide/tbxctl.src
basctl/source/dlged/dlged.cxx
basctl/source/dlged/dlgedfunc.cxx
basctl/source/dlged/dlgedobj.cxx
basctl/source/inc/basidesh.hxx
basctl/source/inc/bastypes.hxx
basctl/source/inc/dlgedmod.hxx
basctl/source/inc/dlgedpage.hxx
crashrep/prj/build.lst
cui/inc/pch/precompiled_cui.hxx
cui/source/customize/acccfg.cxx
cui/source/customize/acccfg.hrc
cui/source/customize/acccfg.src
cui/source/customize/cfg.cxx
cui/source/customize/cfgutil.cxx
cui/source/customize/macropg.cxx
cui/source/customize/macropg.src
cui/source/customize/selector.cxx
cui/source/dialogs/SpellDialog.cxx
cui/source/dialogs/commonlingui.cxx
cui/source/dialogs/cuicharmap.cxx
cui/source/dialogs/cuifmsearch.cxx
cui/source/dialogs/cuigaldlg.cxx
cui/source/dialogs/cuigrfflt.cxx
cui/source/dialogs/hldocntp.cxx
cui/source/dialogs/hldoctp.cxx
cui/source/dialogs/hlinettp.cxx
cui/source/dialogs/hlmailtp.cxx
cui/source/dialogs/hlmarkwn.cxx
cui/source/dialogs/hlmarkwn.src
cui/source/dialogs/hltpbase.cxx
cui/source/dialogs/iconcdlg.cxx
cui/source/dialogs/passwdomdlg.cxx
cui/source/dialogs/pastedlg.cxx
cui/source/dialogs/scriptdlg.cxx
cui/source/dialogs/thesdlg.cxx
cui/source/dialogs/zoom.cxx
cui/source/factory/dlgfact.hxx
cui/source/inc/SpellDialog.hxx
cui/source/inc/autocdlg.hxx
cui/source/inc/backgrnd.hxx
cui/source/inc/bbdlg.hxx
cui/source/inc/cfg.hxx
cui/source/inc/cfgutil.hxx
cui/source/inc/cuigaldlg.hxx
cui/source/inc/cuigrfflt.hxx
cui/source/inc/cuitabarea.hxx
cui/source/inc/cuitabline.hxx
cui/source/inc/hldocntp.hxx
cui/source/inc/hltpbase.hxx
cui/source/inc/iconcdlg.hxx
cui/source/inc/numpages.hxx
cui/source/inc/page.hxx
cui/source/inc/postdlg.hxx
cui/source/inc/scriptdlg.hxx
cui/source/inc/transfrm.hxx
cui/source/inc/zoom.hxx
cui/source/options/cfgchart.cxx
cui/source/options/cuisrchdlg.cxx
cui/source/options/dbregister.cxx
cui/source/options/dbregister.src
cui/source/options/fontsubs.cxx
cui/source/options/internationaloptions.cxx
cui/source/options/optasian.cxx
cui/source/options/optchart.cxx
cui/source/options/optcolor.cxx
cui/source/options/optcolor.src
cui/source/options/optfltr.cxx
cui/source/options/optfltr.src
cui/source/options/optgdlg.cxx
cui/source/options/optgdlg.src
cui/source/options/optgenrl.cxx
cui/source/options/opthtml.cxx
cui/source/options/optimprove.cxx
cui/source/options/optinet2.cxx
cui/source/options/optinet2.hxx
cui/source/options/optjava.cxx
cui/source/options/optlingu.cxx
cui/source/options/optsave.cxx
cui/source/options/optsave.hxx
cui/source/options/treeopt.cxx
cui/source/options/webconninfo.cxx
cui/source/tabpages/autocdlg.cxx
cui/source/tabpages/backgrnd.cxx
cui/source/tabpages/border.cxx
cui/source/tabpages/chardlg.cxx
cui/source/tabpages/dstribut.cxx
cui/source/tabpages/grfpage.cxx
cui/source/tabpages/macroass.cxx
cui/source/tabpages/measure.cxx
cui/source/tabpages/numfmt.cxx
cui/source/tabpages/numpages.cxx
cui/source/tabpages/page.cxx
cui/source/tabpages/paragrph.cxx
cui/source/tabpages/swpossizetabpage.cxx
cui/source/tabpages/tabarea.src
cui/source/tabpages/textanim.cxx
cui/source/tabpages/textattr.cxx
cui/source/tabpages/tparea.cxx
cui/source/tabpages/tpbitmap.cxx
cui/source/tabpages/tpcolor.cxx
cui/source/tabpages/tpgradnt.cxx
cui/source/tabpages/tphatch.cxx
cui/source/tabpages/tpline.cxx
cui/source/tabpages/tplnedef.cxx
cui/source/tabpages/tplneend.cxx
cui/source/tabpages/tpshadow.cxx
cui/source/tabpages/transfrm.cxx
embedserv/source/embed/register.cxx
extensions/inc/pch/precompiled_extensions.hxx
extensions/inc/propctrlr.hrc
extensions/source/abpilot/abpservices.cxx
extensions/source/bibliography/bibload.cxx
extensions/source/bibliography/datman.cxx
extensions/source/bibliography/general.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/inc/componentmodule.cxx
extensions/source/nsplugin/source/so_env.cxx
extensions/source/ole/oleobjw.cxx
extensions/source/ole/oleobjw.hxx
extensions/source/oooimprovement/invite_job.cxx
extensions/source/oooimprovement/onlogrotate_job.cxx
extensions/source/plugin/base/service.cxx
extensions/source/plugin/inc/plugin/unx/mediator.hxx
extensions/source/plugin/inc/plugin/unx/plugcon.hxx
extensions/source/plugin/unx/mediator.cxx
extensions/source/plugin/unx/nppapi.cxx
extensions/source/plugin/unx/plugcon.cxx
extensions/source/preload/services.cxx
extensions/source/propctrlr/formmetadata.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/resource/resource.cxx
extensions/source/scanner/sane.hxx
extensions/source/scanner/sanedlg.cxx
extensions/source/scanner/scanunx.cxx
extensions/source/scanner/scanwin.cxx
extensions/source/scanner/twain.cxx
extensions/source/scanner/twain.hxx
extensions/source/update/check/updatecheckconfig.cxx
extensions/test/stm/datatest.cxx
extensions/test/stm/marktest.cxx
extensions/test/stm/pipetest.cxx
extensions/test/stm/testfactreg.cxx
extensions/workben/testpgp.cxx
forms/qa/complex/forms/CheckOGroupBoxModel.java
forms/qa/makefile.mk
forms/source/component/Button.cxx
forms/source/component/Button.hxx
forms/source/component/ListBox.cxx
forms/source/inc/forms_module_impl.hxx
forms/source/misc/services.cxx
forms/source/solar/control/navtoolbar.cxx
javainstaller2/prj/build.lst
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
lingucomponent/prj/build.lst
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sreg.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/source/manifest/ManifestExport.cxx
package/source/manifest/UnoRegister.cxx
package/source/xstor/owriteablestream.cxx
package/source/xstor/owriteablestream.hxx
package/source/xstor/xstorage.hxx
package/source/zippackage/ZipPackageFolder.cxx
package/source/zippackage/ZipPackageStream.cxx
setup_native/source/mac/ooo/DS_Store
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
xmlsecurity/prj/build.lst
xmlsecurity/source/component/registerservices.cxx
xmlsecurity/source/dialogs/stbcontrl.cxx
xmlsecurity/source/framework/xsec_framework.cxx
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
xmlsecurity/tools/demo/util.hxx
xmlsecurity/workben/signaturetest.cxx

1 files changed, 39 insertions, 45 deletions

diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index 0f666941e57e..4b2f2ba90952 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -27,59 +27,53 @@
 #ifndef _BASCTL_HELPID_HRC
 #define _BASCTL_HELPID_HRC
 
-// include ---------------------------------------------------------------
+#define HID_BASICIDE_TOOLBOX                              "BASCTL_HID_BASICIDE_TOOLBOX"
+#define HID_BASICIDE_OBJECTS                              "BASCTL_HID_BASICIDE_OBJECTS"
+#define HID_MACRO_OPTIONS                                 "BASCTL_HID_MACRO_OPTIONS"
+#define HID_BASICIDE_BRKPNTS                              "BASCTL_HID_BASICIDE_BRKPNTS"
+#define HID_BASICIDE_MODULS                               "BASCTL_HID_BASICIDE_MODULS"
+#define HID_BASICIDE_LIBS_TP                              "BASCTL_HID_BASICIDE_LIBS_TP"
+#define HID_BASICIDE_LIBS_DLG                             "BASCTL_HID_BASICIDE_LIBS_DLG"
+#define HID_BASICIDE_CONTROLS                             "BASCTL_HID_BASICIDE_CONTROLS"
+#define HID_BASICIDE_MACROS                               "BASCTL_HID_BASICIDE_MACROS"
+#define HID_BASICIDE_LIBS                                 "BASCTL_HID_BASICIDE_LIBS"
+#define HID_BASICIDE_ORG_TC                               "BASCTL_HID_BASICIDE_ORG_TC"
 
-#include <svl/solar.hrc>
+#define HID_BASICIDE_MODULES_TREE                         "BASCTL_HID_BASICIDE_MODULES_TREE"
+#define HID_BASICIDE_LIBS_TREE                            "BASCTL_HID_BASICIDE_LIBS_TREE"
+#define HID_BASICIDE_LIBSDLG_TREE                         "BASCTL_HID_BASICIDE_LIBSDLG_TREE"
+#define HID_BASICIDE_OBJECTCAT                            "BASCTL_HID_BASICIDE_OBJECTCAT"
 
-// Help-Ids --------------------------------------------------------------
+#define HID_BASICIDE_PROP_BROWSER                         "BASCTL_HID_BASICIDE_PROP_BROWSER"
 
-#define HID_BASICIDE_TOOLBOX                    (HID_BASICIDE_START +   0)
-#define HID_BASICIDE_OBJECTS                    (HID_BASICIDE_START +   1)
-#define HID_MACRO_OPTIONS                       (HID_BASICIDE_START +   2)
-#define HID_BASICIDE_BRKPNTS                    (HID_BASICIDE_START +   3)
-#define HID_BASICIDE_MODULS                     (HID_BASICIDE_START +   4)
-#define HID_BASICIDE_LIBS_TP                    (HID_BASICIDE_START +   5)
-#define HID_BASICIDE_LIBS_DLG                   (HID_BASICIDE_START +   6)
-#define HID_BASICIDE_CONTROLS                   (HID_BASICIDE_START +   7)
-#define HID_BASICIDE_MACROS                     (HID_BASICIDE_START +   8)
-#define HID_BASICIDE_LIBS                       (HID_BASICIDE_START +   9)
-#define HID_BASICIDE_ORG_TC                     (HID_BASICIDE_START +  10)
+#define HID_BASICIDE_PROP_BROWSER_LBOX                    "BASCTL_HID_BASICIDE_PROP_BROWSER_LBOX"
 
-#define HID_BASICIDE_MODULES_TREE               (HID_BASICIDE_START +  11)
-#define HID_BASICIDE_LIBS_TREE                  (HID_BASICIDE_START +  12)
-#define HID_BASICIDE_LIBSDLG_TREE               (HID_BASICIDE_START +  13)
-#define HID_BASICIDE_OBJECTCAT                  (HID_BASICIDE_START +  14)
+#define HID_BASICIDE_OBJCAT_SHOW                          "BASCTL_HID_BASICIDE_OBJCAT_SHOW"
+#define HID_BASICIDE_OBJCAT_PROPS                         "BASCTL_HID_BASICIDE_OBJCAT_PROPS"
+#define HID_BASICIDE_OBJCAT_HELP                          "BASCTL_HID_BASICIDE_OBJCAT_HELP"
 
-#define HID_BASICIDE_PROP_BROWSER               (HID_BASICIDE_START +  15)
+#define HID_BASICIDE_BRKDLG                               "BASCTL_HID_BASICIDE_BRKDLG"
+#define HID_BASICIDE_ACTIV                                "BASCTL_HID_BASICIDE_ACTIV"
+#define HID_BASICIDE_BRKPROPS                             "BASCTL_HID_BASICIDE_BRKPROPS"
+#define HID_BASICIDE_REMOVEWATCH                          "BASCTL_HID_BASICIDE_REMOVEWATCH"
+#define HID_BASICIDE_GOTOALL                              "BASCTL_HID_BASICIDE_GOTOALL"
 
-#define HID_BASICIDE_PROP_BROWSER_LBOX          (HID_BASICIDE_START +  16)
+#define HID_BASICIDE_MODULWINDOW                          "BASCTL_HID_BASICIDE_MODULWINDOW"
+#define HID_BASICIDE_DIALOGWINDOW                         "BASCTL_HID_BASICIDE_DIALOGWINDOW"
 
-#define HID_BASICIDE_OBJCAT_SHOW                (HID_BASICIDE_START +  17)
-#define HID_BASICIDE_OBJCAT_PROPS               (HID_BASICIDE_START +  18)
-#define HID_BASICIDE_OBJCAT_HELP                (HID_BASICIDE_START +  19)
+#define HID_BASICIDE_EDITORWINDOW                         "BASCTL_HID_BASICIDE_EDITORWINDOW"
+#define HID_BASICIDE_BREAKPOINTWINDOW                     "BASCTL_HID_BASICIDE_BREAKPOINTWINDOW"
+#define HID_BASICIDE_WATCHWINDOW                          "BASCTL_HID_BASICIDE_WATCHWINDOW"
+#define HID_BASICIDE_STACKWINDOW                          "BASCTL_HID_BASICIDE_STACKWINDOW"
+#define HID_BASICIDE_TABBAR                               "BASCTL_HID_BASICIDE_TABBAR"
+#define HID_BASICIDE_WATCHWINDOW_EDIT                     "BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT"
+#define HID_BASICIDE_WATCHWINDOW_LIST                     "BASCTL_HID_BASICIDE_WATCHWINDOW_LIST"
+#define HID_BASICIDE_STACKWINDOW_LIST                     "BASCTL_HID_BASICIDE_STACKWINDOW_LIST"
 
-#define HID_BASICIDE_BRKDLG                     (HID_BASICIDE_START +  20)
-#define HID_BASICIDE_ACTIV                      (HID_BASICIDE_START +  21)
-#define HID_BASICIDE_BRKPROPS                   (HID_BASICIDE_START +  22)
-#define HID_BASICIDE_REMOVEWATCH                (HID_BASICIDE_START +  23)
-#define HID_BASICIDE_GOTOALL                    (HID_BASICIDE_START +  24)
-
-#define HID_BASICIDE_MODULWINDOW                (HID_BASICIDE_START +  25)
-#define HID_BASICIDE_DIALOGWINDOW               (HID_BASICIDE_START +  26)
-
-#define HID_BASICIDE_EDITORWINDOW               (HID_BASICIDE_START +  27)
-#define HID_BASICIDE_BREAKPOINTWINDOW           (HID_BASICIDE_START +  28)
-#define HID_BASICIDE_WATCHWINDOW                (HID_BASICIDE_START +  29)
-#define HID_BASICIDE_STACKWINDOW                (HID_BASICIDE_START +  30)
-#define HID_BASICIDE_TABBAR                     (HID_BASICIDE_START +  31)
-#define HID_BASICIDE_WATCHWINDOW_EDIT           (HID_BASICIDE_START +  32)
-#define HID_BASICIDE_WATCHWINDOW_LIST           (HID_BASICIDE_START +  33)
-#define HID_BASICIDE_STACKWINDOW_LIST           (HID_BASICIDE_START +  34)
-
-#define HID_BASICIDE_MANAGE_LANGUAGE            (HID_BASICIDE_START +  35)
-#define HID_BASICIDE_SETDEFAULT_LANGUAGE        (HID_BASICIDE_START +  36)
-#define HID_BASICIDE_ADDNEW_LANGUAGE            (HID_BASICIDE_START +  37)
-#define HID_BASICIDE_ADDNEW_CONTROL             (HID_BASICIDE_START +  38)
+#define HID_BASICIDE_MANAGE_LANGUAGE                      "BASCTL_HID_BASICIDE_MANAGE_LANGUAGE"
+#define HID_BASICIDE_SETDEFAULT_LANGUAGE                  "BASCTL_HID_BASICIDE_SETDEFAULT_LANGUAGE"
+#define HID_BASICIDE_ADDNEW_LANGUAGE                      "BASCTL_HID_BASICIDE_ADDNEW_LANGUAGE"
+#define HID_BASICIDE_ADDNEW_CONTROL                       "BASCTL_HID_BASICIDE_ADDNEW_CONTROL"
 
 #endif