Merge commit 'ooo/DEV300_m101' into intm101

The following builds for me:

basebmp, basegfx, comphelper, dtrans, i18npool, i18nutil, l10ntools, o3tl,
psprint_config, regexp, rsc, sax, sot, tools, ucbhelper, unotools, vcl

The rest still needs fixing ;-)

Conflicts:
canvas/prj/build.lst
canvas/source/cairo/cairo_textlayout.cxx
canvas/source/directx/dx_winstuff.hxx
canvas/source/tools/image.cxx
canvas/source/vcl/canvashelper.cxx
comphelper/inc/comphelper/documentconstants.hxx
comphelper/inc/comphelper/optionalvalue.hxx
comphelper/inc/comphelper/querydeep.hxx
comphelper/prj/build.lst
comphelper/qa/complex/makefile.mk
comphelper/qa/string/test_string_noadditional.cxx
comphelper/source/misc/componentmodule.cxx
comphelper/source/misc/mimeconfighelper.cxx
comphelper/source/misc/querydeep.cxx
comphelper/source/misc/uieventslogger.cxx
comphelper/source/property/TypeGeneration.cxx
comphelper/test/uno_iterators/uno_iterators.cxx
comphelper/util/makefile.mk
cppcanvas/source/mtfrenderer/implrenderer.cxx
dtrans/prj/build.lst
dtrans/source/generic/dtrans.cxx
dtrans/source/win32/dtobj/FmtFilter.cxx
i18npool/prj/build.lst
i18npool/source/localedata/data/localedata_others.map
i18npool/source/localedata/data/makefile.mk
i18npool/source/localedata/localedata.cxx
i18npool/source/localedata/saxparser.cxx
i18npool/source/registerservices/registerservices.cxx
i18npool/source/search/textsearch.cxx
l10ntools/inc/cfgmerge.hxx
l10ntools/inc/export.hxx
l10ntools/inc/gsicheck.hxx
l10ntools/inc/l10ntools/vosapp.hxx
l10ntools/inc/tagtest.hxx
l10ntools/inc/xmlparse.hxx
l10ntools/layout/layoutparse.cxx
l10ntools/layout/tralay.cxx
l10ntools/source/cfgmerge.cxx
l10ntools/source/export.cxx
l10ntools/source/export2.cxx
l10ntools/source/gsicheck.cxx
l10ntools/source/help/HelpLinker.cxx
l10ntools/source/lngex.cxx
l10ntools/source/lngmerge.cxx
l10ntools/source/merge.cxx
l10ntools/source/tagtest.cxx
l10ntools/source/xmlparse.cxx
padmin/source/fontentry.cxx
padmin/source/padialog.cxx
padmin/source/padialog.src
padmin/source/pamain.cxx
rsc/inc/rscarray.hxx
rsc/inc/rscclass.hxx
rsc/inc/rscclobj.hxx
rsc/inc/rsccont.hxx
rsc/inc/rscdb.hxx
rsc/inc/rscdef.hxx
rsc/inc/rscmgr.hxx
rsc/inc/rscrange.hxx
rsc/inc/rsctop.hxx
rsc/inc/vclrsc.hxx
rsc/source/parser/rscdb.cxx
rsc/source/parser/rscicpx.cxx
rsc/source/parser/rscinit.cxx
rsc/source/prj/start.cxx
rsc/source/res/rscarray.cxx
rsc/source/res/rscclass.cxx
rsc/source/res/rscclobj.cxx
rsc/source/res/rsccont.cxx
rsc/source/res/rscmgr.cxx
rsc/source/res/rscrange.cxx
rsc/source/res/rsctop.cxx
rsc/source/rsc/rsc.cxx
rsc/source/tools/rscdef.cxx
rsc/source/tools/rsctools.cxx
sax/source/expatwrap/sax_expat.cxx
sax/source/fastparser/facreg.cxx
sax/source/tools/fastserializer.cxx
sot/inc/sot/filelist.hxx
sot/inc/sot/object.hxx
sot/source/base/factory.cxx
sot/source/base/filelist.cxx
sot/source/sdstor/stg.cxx
sot/source/sdstor/stgcache.cxx
sot/source/sdstor/stgole.cxx
sot/source/sdstor/stgstrms.cxx
sot/source/sdstor/storage.cxx
sot/source/sdstor/ucbstorage.cxx
svl/inc/svl/cenumitm.hxx
svl/inc/svl/cintitem.hxx
svl/inc/svl/cntwall.hxx
svl/inc/svl/ctypeitm.hxx
svl/inc/svl/custritm.hxx
svl/inc/svl/dateitem.hxx
svl/inc/svl/filerec.hxx
svl/inc/svl/globalnameitem.hxx
svl/inc/svl/ilstitem.hxx
svl/inc/svl/imageitm.hxx
svl/inc/svl/intitem.hxx
svl/inc/svl/itempool.hxx
svl/inc/svl/itemset.hxx
svl/inc/svl/lckbitem.hxx
svl/inc/svl/poolitem.hxx
svl/inc/svl/ptitem.hxx
svl/inc/svl/rectitem.hxx
svl/inc/svl/sfontitm.hxx
svl/inc/svl/slstitm.hxx
svl/inc/svl/srchitem.hxx
svl/inc/svl/svarray.hxx
svl/inc/svl/svdde.hxx
svl/inc/svl/svstdarr.hxx
svl/inc/svl/szitem.hxx
svl/inc/svl/visitem.hxx
svl/inc/svl/zforlist.hxx
svl/inc/svl/zformat.hxx
svl/prj/build.lst
svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
svl/qa/complex/ConfigItems/helper/makefile.mk
svl/qa/makefile.mk
svl/source/filepicker/pickerhelper.cxx
svl/source/filerec/filerec.cxx
svl/source/items/cenumitm.cxx
svl/source/items/cintitem.cxx
svl/source/items/cntwall.cxx
svl/source/items/ctypeitm.cxx
svl/source/items/custritm.cxx
svl/source/items/dateitem.cxx
svl/source/items/globalnameitem.cxx
svl/source/items/ilstitem.cxx
svl/source/items/imageitm.cxx
svl/source/items/intitem.cxx
svl/source/items/itempool.cxx
svl/source/items/itemprop.cxx
svl/source/items/itemset.cxx
svl/source/items/lckbitem.cxx
svl/source/items/poolio.cxx
svl/source/items/poolitem.cxx
svl/source/items/ptitem.cxx
svl/source/items/rectitem.cxx
svl/source/items/slstitm.cxx
svl/source/items/srchitem.cxx
svl/source/items/style.cxx
svl/source/items/szitem.cxx
svl/source/items/visitem.cxx
svl/source/items/whiter.cxx
svl/source/memtools/svarray.cxx
svl/source/misc/PasswordHelper.cxx
svl/source/misc/adrparse.cxx
svl/source/misc/lngmisc.cxx
svl/source/notify/brdcst.cxx
svl/source/notify/listener.cxx
svl/source/notify/listenerbase.cxx
svl/source/numbers/makefile.mk
svl/source/numbers/nbdll.cxx
svl/source/numbers/zforfind.cxx
svl/source/numbers/zforlist.cxx
svl/source/numbers/zformat.cxx
svl/source/numbers/zforscan.cxx
svl/source/passwordcontainer/passwordcontainer.cxx
svl/source/svdde/ddecli.cxx
svl/source/svdde/ddeimp.hxx
svl/source/svdde/ddemlos2.h
svl/source/svdde/ddesvr.cxx
svl/source/undo/undo.cxx
svl/source/uno/registerservices.cxx
svl/util/makefile.mk
svtools/bmpmaker/bmpsum.cxx
svtools/bmpmaker/g2g.cxx
svtools/bmpmaker/makefile.mk
svtools/inc/borderhelper.hxx
svtools/inc/svtools/accessiblefactory.hxx
svtools/inc/svtools/apearcfg.hxx
svtools/inc/svtools/brwbox.hxx
svtools/inc/svtools/ctrlbox.hxx
svtools/inc/svtools/ctrltool.hxx
svtools/inc/svtools/editbrowsebox.hxx
svtools/inc/svtools/ehdl.hxx
svtools/inc/svtools/embedhlp.hxx
svtools/inc/svtools/filter.hxx
svtools/inc/svtools/ivctrl.hxx
svtools/inc/svtools/parhtml.hxx
svtools/inc/svtools/printdlg.hxx
svtools/inc/svtools/rtftoken.h
svtools/inc/svtools/ruler.hxx
svtools/inc/svtools/svicnvw.hxx
svtools/inc/svtools/svlbitm.hxx
svtools/inc/svtools/svlbox.hxx
svtools/inc/svtools/svtreebx.hxx
svtools/inc/svtools/tabbar.hxx
svtools/inc/svtools/table/abstracttablecontrol.hxx
svtools/inc/svtools/taskbar.hxx
svtools/inc/svtools/textview.hxx
svtools/inc/svtools/valueset.hxx
svtools/source/brwbox/brwbox1.cxx
svtools/source/brwbox/brwbox2.cxx
svtools/source/brwbox/datwin.cxx
svtools/source/brwbox/datwin.hxx
svtools/source/brwbox/makefile.mk
svtools/source/config/apearcfg.cxx
svtools/source/config/htmlcfg.cxx
svtools/source/config/menuoptions.cxx
svtools/source/config/miscopt.cxx
svtools/source/contnr/cont_pch.cxx
svtools/source/contnr/ctrdll.cxx
svtools/source/contnr/fileview.cxx
svtools/source/contnr/imivctl1.cxx
svtools/source/contnr/ivctrl.cxx
svtools/source/contnr/makefile.mk
svtools/source/contnr/svcontnr.src
svtools/source/contnr/svicnvw.cxx
svtools/source/contnr/svimpbox.cxx
svtools/source/contnr/svimpicn.cxx
svtools/source/contnr/svlbitm.cxx
svtools/source/contnr/svtreebx.cxx
svtools/source/contnr/templwin.cxx
svtools/source/contnr/templwin.hxx
svtools/source/control/asynclink.cxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/ctrldll.cxx
svtools/source/control/ctrltool.cxx
svtools/source/control/filectrl.cxx
svtools/source/control/filectrl.src
svtools/source/control/headbar.cxx
svtools/source/control/inettbc.cxx
svtools/source/control/makefile.mk
svtools/source/control/prgsbar.cxx
svtools/source/control/roadmap.cxx
svtools/source/control/ruler.cxx
svtools/source/control/scriptedtext.cxx
svtools/source/control/stdmenu.cxx
svtools/source/control/tabbar.cxx
svtools/source/control/taskbar.cxx
svtools/source/control/taskbox.cxx
svtools/source/control/taskmisc.cxx
svtools/source/control/taskstat.cxx
svtools/source/control/valueacc.cxx
svtools/source/control/valueset.cxx
svtools/source/dialogs/addresstemplate.cxx
svtools/source/dialogs/addresstemplate.src
svtools/source/dialogs/colrdlg.src
svtools/source/dialogs/filedlg2.cxx
svtools/source/dialogs/filedlg2.hxx
svtools/source/dialogs/makefile.mk
svtools/source/dialogs/printdlg.cxx
svtools/source/dialogs/printdlg.src
svtools/source/dialogs/propctrl.cxx
svtools/source/dialogs/propctrl.hxx
svtools/source/dialogs/property.cxx
svtools/source/edit/makefile.mk
svtools/source/edit/sychconv.cxx
svtools/source/edit/syntaxhighlight.cxx
svtools/source/edit/textdoc.cxx
svtools/source/edit/texteng.cxx
svtools/source/edit/textundo.cxx
svtools/source/edit/textview.cxx
svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
svtools/source/filter.vcl/filter/dlgejpg.cxx
svtools/source/filter.vcl/filter/dlgejpg.hxx
svtools/source/filter.vcl/filter/dlgejpg.src
svtools/source/filter.vcl/filter/dlgepng.cxx
svtools/source/filter.vcl/filter/dlgepng.hxx
svtools/source/filter.vcl/filter/dlgepng.src
svtools/source/filter.vcl/filter/dlgexpor.cxx
svtools/source/filter.vcl/filter/dlgexpor.hxx
svtools/source/filter.vcl/filter/dlgexpor.src
svtools/source/filter.vcl/filter/filter2.cxx
svtools/source/filter.vcl/filter/makefile.mk
svtools/source/filter.vcl/filter/sgfbram.cxx
svtools/source/filter.vcl/filter/sgvmain.cxx
svtools/source/filter.vcl/filter/sgvspln.cxx
svtools/source/filter.vcl/filter/strings.src
svtools/source/filter.vcl/jpeg/makefile.mk
svtools/source/filter.vcl/wmf/emfwr.cxx
svtools/source/filter.vcl/wmf/emfwr.hxx
svtools/source/filter.vcl/wmf/enhwmf.cxx
svtools/source/filter.vcl/wmf/winmtf.hxx
svtools/source/filter.vcl/wmf/wmfwr.cxx
svtools/source/filter.vcl/wmf/wmfwr.hxx
svtools/source/graphic/grfcache.cxx
svtools/source/graphic/grfcache.hxx
svtools/source/graphic/grfmgr.cxx
svtools/source/graphic/makefile.mk
svtools/source/inc/accessibletableimp.hxx
svtools/source/inc/svimpbox.hxx
svtools/source/java/patchjavaerror.src
svtools/source/misc/ehdl.cxx
svtools/source/misc/errtxt.src
svtools/source/misc/helpagentwindow.cxx
svtools/source/misc/imagemgr.cxx
svtools/source/misc/imagemgr.src
svtools/source/misc/imageresourceaccess.cxx
svtools/source/misc/imap.cxx
svtools/source/misc/langtab.src
svtools/source/misc/makefile.mk
svtools/source/misc/svtdata.cxx
svtools/source/misc/templatefoldercache.cxx
svtools/source/misc/transfer2.cxx
svtools/source/misc/undo.src
svtools/source/plugapp/commtest.cxx
svtools/source/plugapp/commtest.src
svtools/source/plugapp/makefile.mk
svtools/source/plugapp/testtool.src
svtools/source/productregistration/productregistration.cxx
svtools/source/svhtml/htmlkywd.cxx
svtools/source/svhtml/parhtml.cxx
svtools/source/svrtf/rtfkey2.cxx
svtools/source/svrtf/rtfkeywd.cxx
svtools/source/table/defaultinputhandler.cxx
svtools/source/table/makefile.mk
svtools/source/table/tablecontrol.cxx
svtools/source/table/tablecontrol_impl.cxx
svtools/source/table/tablecontrol_impl.hxx
svtools/source/table/tabledatawindow.cxx
svtools/source/table/tablegeometry.cxx
svtools/source/table/tablegeometry.hxx
svtools/source/toolpanel/makefile.mk
svtools/source/toolpanel/toolpaneldrawer.cxx
svtools/source/uno/addrtempuno.cxx
svtools/source/uno/miscservices.cxx
svtools/source/uno/svtxgridcontrol.cxx
svtools/source/uno/svtxgridcontrol.hxx
svtools/source/uno/toolboxcontroller.cxx
svtools/source/uno/treecontrolpeer.cxx
svtools/source/uno/unocontroltablemodel.cxx
svtools/source/uno/unocontroltablemodel.hxx
svtools/source/uno/unoimap.cxx
svtools/source/urlobj/inetimg.cxx
svtools/util/makefile.mk
svtools/workben/browser.cxx
svtools/workben/cui/makefile.mk
svtools/workben/makefile.mk
svtools/workben/stest.cxx
svtools/workben/toolpanel/makefile.mk
svtools/workben/urange.cxx
toolkit/inc/toolkit/awt/vclxdevice.hxx
toolkit/inc/toolkit/awt/vclxgraphics.hxx
toolkit/inc/toolkit/awt/vclxwindows.hxx
toolkit/inc/toolkit/controls/dialogcontrol.hxx
toolkit/inc/toolkit/helper/property.hxx
toolkit/inc/toolkit/helper/servicenames.hxx
toolkit/inc/toolkit/helper/throbberimpl.hxx
toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java
toolkit/source/awt/asynccallback.cxx
toolkit/source/awt/vclxgraphics.cxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/awt/vclxwindow.cxx
toolkit/source/awt/xsimpleanimation.cxx
toolkit/source/awt/xthrobber.cxx
toolkit/source/controls/dialogcontrol.cxx
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
toolkit/source/controls/grid/defaultgriddatamodel.cxx
toolkit/source/controls/grid/gridcontrol.cxx
toolkit/source/controls/grid/initguard.hxx
toolkit/source/controls/unocontrol.cxx
toolkit/source/controls/unocontrolcontainer.cxx
toolkit/source/controls/unocontrols.cxx
toolkit/source/helper/listenermultiplexer.cxx
toolkit/source/helper/property.cxx
toolkit/source/helper/registerservices.cxx
toolkit/source/helper/servicenames.cxx
toolkit/source/helper/throbberimpl.cxx
toolkit/source/helper/tkresmgr.cxx
tools/StaticLibrary_ooopathutils.mk
tools/bootstrp/addexes/makefile.mk
tools/bootstrp/addexes2/makefile.mk
tools/bootstrp/addexes2/mkfilt.cxx
tools/bootstrp/command.cxx
tools/bootstrp/cppdep.cxx
tools/bootstrp/iserver.cxx
tools/bootstrp/makefile.mk
tools/bootstrp/mkcreate.cxx
tools/bootstrp/prj.cxx
tools/bootstrp/rscdep.cxx
tools/bootstrp/sstring.cxx
tools/inc/bootstrp/command.hxx
tools/inc/bootstrp/mkcreate.hxx
tools/inc/bootstrp/prj.hxx
tools/inc/bootstrp/sstring.hxx
tools/inc/tools/agapi.hxx
tools/inc/tools/agitem.hxx
tools/inc/tools/chapi.hxx
tools/inc/tools/download.hxx
tools/inc/tools/eacopier.hxx
tools/inc/tools/fract.hxx
tools/inc/tools/fsys.hxx
tools/inc/tools/geninfo.hxx
tools/inc/tools/globname.hxx
tools/inc/tools/inetmime.hxx
tools/inc/tools/multisel.hxx
tools/inc/tools/poly.hxx
tools/inc/tools/postsys.h
tools/inc/tools/postwin.h
tools/inc/tools/presys.h
tools/inc/tools/prewin.h
tools/inc/tools/pstm.hxx
tools/inc/tools/ref.hxx
tools/inc/tools/simplerm.hxx
tools/inc/tools/solar.h
tools/inc/tools/table.hxx
tools/inc/tools/urlkeys.hxx
tools/inc/tools/urlobj.hxx
tools/prj/build.lst
tools/prj/d.lst
tools/qa/makefile.mk
tools/source/communi/geninfo.cxx
tools/source/debug/debug.cxx
tools/source/fsys/dirent.cxx
tools/source/fsys/tdir.cxx
tools/source/fsys/unx.cxx
tools/source/fsys/urlobj.cxx
tools/source/generic/color.cxx
tools/source/generic/config.cxx
tools/source/generic/fract.cxx
tools/source/inet/inetmime.cxx
tools/source/memtools/multisel.cxx
tools/source/memtools/table.cxx
tools/source/rc/resmgr.cxx
tools/source/ref/globname.cxx
tools/source/ref/pstm.cxx
tools/source/solar/solar.c
tools/source/stream/strmos2.cxx
tools/source/stream/strmunx.cxx
tools/source/stream/strmwnt.cxx
tools/source/string/makefile.mk
tools/source/testtoolloader/testtoolloader.cxx
tools/test/makefile.mk
tools/util/makefile.mk
tools/win/inc/dll.hxx
tools/win/inc/parser.hxx
tools/win/inc/shellex.h
tools/win/inc/shutil.h
tools/win/inc/toolsdll.hxx
tools/win/inc/winshell.hxx
tools/workben/makefile.mk
ucbhelper/source/client/proxydecider.cxx
ucbhelper/workben/ucbexplorer/ucbexplorer.hrc
unotools/inc/unotools/unotunnelhelper.hxx
unotools/source/config/fltrcfg.cxx
unotools/source/config/lingucfg.cxx
unotools/source/config/misccfg.cxx
unotools/source/config/pathoptions.cxx
unotools/source/config/searchopt.cxx
unotools/source/i18n/localedatawrapper.cxx
unotools/source/ucbhelper/localfilehelper.cxx
unotools/source/ucbhelper/ucbhelper.cxx
unotools/source/ucbhelper/xtempfile.cxx
vcl/aqua/inc/salbmp.h
vcl/aqua/inc/salgdi.h
vcl/aqua/inc/salinst.h
vcl/aqua/source/app/salinst.cxx
vcl/aqua/source/gdi/aquaprintaccessoryview.mm
vcl/aqua/source/gdi/salgdi.cxx
vcl/aqua/source/gdi/salprn.cxx
vcl/aqua/source/window/salframeview.mm
vcl/aqua/source/window/salobj.cxx
vcl/inc/vcl/bitmap.hxx
vcl/inc/vcl/brdwin.hxx
vcl/inc/vcl/button.hxx
vcl/inc/vcl/cmdevt.hxx
vcl/inc/vcl/cvtgrf.hxx
vcl/inc/vcl/dialog.hxx
vcl/inc/vcl/dockwin.hxx
vcl/inc/vcl/event.hxx
vcl/inc/vcl/fixed.hxx
vcl/inc/vcl/fldunit.hxx
vcl/inc/vcl/floatwin.hxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/glyphcache.hxx
vcl/inc/vcl/graphite_adaptors.hxx
vcl/inc/vcl/graphite_features.hxx
vcl/inc/vcl/graphite_layout.hxx
vcl/inc/vcl/ilstbox.hxx
vcl/inc/vcl/image.h
vcl/inc/vcl/imgctrl.hxx
vcl/inc/vcl/impbmpconv.hxx
vcl/inc/vcl/impprn.hxx
vcl/inc/vcl/jobset.h
vcl/inc/vcl/keycodes.hxx
vcl/inc/vcl/lstbox.hxx
vcl/inc/vcl/mapunit.hxx
vcl/inc/vcl/menu.hxx
vcl/inc/vcl/msgbox.hxx
vcl/inc/vcl/outdev.hxx
vcl/inc/vcl/prndlg.hxx
vcl/inc/vcl/salatype.hxx
vcl/inc/vcl/salbmp.hxx
vcl/inc/vcl/salgdi.hxx
vcl/inc/vcl/salinst.hxx
vcl/inc/vcl/seleng.hxx
vcl/inc/vcl/settings.hxx
vcl/inc/vcl/smartid.hxx
vcl/inc/vcl/status.hxx
vcl/inc/vcl/strhelper.hxx
vcl/inc/vcl/svapp.hxx
vcl/inc/vcl/svdata.hxx
vcl/inc/vcl/syschild.hxx
vcl/inc/vcl/sysdata.hxx
vcl/inc/vcl/taskpanelist.hxx
vcl/inc/vcl/toolbox.hxx
vcl/inc/vcl/vclevent.hxx
vcl/inc/vcl/windata.hxx
vcl/inc/vcl/window.hxx
vcl/inc/vcl/wintypes.hxx
vcl/os2/source/app/salinst.cxx
vcl/os2/source/gdi/salgdi.cxx
vcl/os2/source/window/salmenu.cxx
vcl/os2/source/window/salobj.cxx
vcl/prj/build.lst
vcl/source/app/dbggui.cxx
vcl/source/app/help.cxx
vcl/source/app/idlemgr.cxx
vcl/source/app/settings.cxx
vcl/source/app/svapp.cxx
vcl/source/app/svdata.cxx
vcl/source/app/svmain.cxx
vcl/source/app/svmainhook.cxx
vcl/source/app/unohelp.cxx
vcl/source/app/vclevent.cxx
vcl/source/control/button.cxx
vcl/source/control/combobox.cxx
vcl/source/control/edit.cxx
vcl/source/control/field.cxx
vcl/source/control/fixed.cxx
vcl/source/control/ilstbox.cxx
vcl/source/control/imgctrl.cxx
vcl/source/control/makefile.mk
vcl/source/control/tabctrl.cxx
vcl/source/gdi/bitmap.cxx
vcl/source/gdi/bitmap2.cxx
vcl/source/gdi/bitmap4.cxx
vcl/source/gdi/bmpconv.cxx
vcl/source/gdi/cvtsvm.cxx
vcl/source/gdi/font.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/gdi/image.cxx
vcl/source/gdi/impimage.cxx
vcl/source/gdi/jobset.cxx
vcl/source/gdi/makefile.mk
vcl/source/gdi/metaact.cxx
vcl/source/gdi/outdev.cxx
vcl/source/gdi/outdev3.cxx
vcl/source/gdi/outdev4.cxx
vcl/source/gdi/outdevnative.cxx
vcl/source/gdi/pdfwriter.cxx
vcl/source/gdi/pdfwriter_impl.cxx
vcl/source/gdi/print3.cxx
vcl/source/gdi/salmisc.cxx
vcl/source/glyphs/gcach_ftyp.cxx
vcl/source/glyphs/gcach_ftyp.hxx
vcl/source/glyphs/glyphcache.cxx
vcl/source/glyphs/graphite_cache.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/source/glyphs/graphite_textsrc.hxx
vcl/source/helper/canvasbitmap.cxx
vcl/source/helper/smartid.cxx
vcl/source/helper/xconnection.cxx
vcl/source/src/btntext.src
vcl/source/src/images.src
vcl/source/src/print.src
vcl/source/window/accel.cxx
vcl/source/window/accmgr.cxx
vcl/source/window/brdwin.cxx
vcl/source/window/btndlg.cxx
vcl/source/window/dlgctrl.cxx
vcl/source/window/javachild.cxx
vcl/source/window/menu.cxx
vcl/source/window/msgbox.cxx
vcl/source/window/printdlg.cxx
vcl/source/window/status.cxx
vcl/source/window/syschild.cxx
vcl/source/window/toolbox.cxx
vcl/source/window/toolbox2.cxx
vcl/source/window/window.cxx
vcl/source/window/window2.cxx
vcl/source/window/wrkwin.cxx
vcl/unx/gtk/app/gtkdata.cxx
vcl/unx/gtk/app/gtkinst.cxx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
vcl/unx/gtk/window/gtkframe.cxx
vcl/unx/gtk/window/gtkobject.cxx
vcl/unx/headless/svpbmp.hxx
vcl/unx/headless/svpgdi.cxx
vcl/unx/headless/svpgdi.hxx
vcl/unx/headless/svpinst.cxx
vcl/unx/headless/svpinst.hxx
vcl/unx/headless/svpprn.cxx
vcl/unx/headless/svpprn.hxx
vcl/unx/headless/svppspgraphics.cxx
vcl/unx/headless/svppspgraphics.hxx
vcl/unx/headless/svptext.cxx
vcl/unx/inc/dtint.hxx
vcl/unx/inc/plugins/gtk/gtkdata.hxx
vcl/unx/inc/pspgraphics.h
vcl/unx/inc/salbmp.h
vcl/unx/inc/saldata.hxx
vcl/unx/inc/saldisp.hxx
vcl/unx/inc/salgdi.h
vcl/unx/inc/salinst.h
vcl/unx/inc/xfont.hxx
vcl/unx/kde/kdedata.cxx
vcl/unx/kde4/KDESalGraphics.cxx
vcl/unx/source/app/keysymnames.cxx
vcl/unx/source/app/saldata.cxx
vcl/unx/source/app/saldisp.cxx
vcl/unx/source/app/salinst.cxx
vcl/unx/source/app/wmadaptor.cxx
vcl/unx/source/dtrans/X11_selection.cxx
vcl/unx/source/dtrans/X11_service.cxx
vcl/unx/source/gdi/makefile.mk
vcl/unx/source/gdi/pspgraphics.cxx
vcl/unx/source/gdi/salgdi.cxx
vcl/unx/source/gdi/salgdi3.cxx
vcl/unx/source/gdi/salprnpsp.cxx
vcl/unx/source/gdi/xfont.cxx
vcl/unx/source/gdi/xlfd_attr.cxx
vcl/unx/source/gdi/xlfd_attr.hxx
vcl/unx/source/gdi/xlfd_extd.cxx
vcl/unx/source/gdi/xlfd_extd.hxx
vcl/unx/source/gdi/xlfd_smpl.cxx
vcl/unx/source/gdi/xlfd_smpl.hxx
vcl/unx/source/printer/ppdparser.cxx
vcl/unx/source/printer/printerinfomanager.cxx
vcl/unx/source/window/salframe.cxx
vcl/unx/source/window/salmenu.cxx
vcl/unx/source/window/salobj.cxx
vcl/util/makefile2.pmk
vcl/win/inc/salbmp.h
vcl/win/inc/saldata.hxx
vcl/win/inc/salgdi.h
vcl/win/inc/salinst.h
vcl/win/source/app/saldata.cxx
vcl/win/source/app/salinst.cxx
vcl/win/source/gdi/salgdi.cxx
vcl/win/source/gdi/salgdi3.cxx
vcl/win/source/gdi/salprn.cxx
vcl/win/source/gdi/winlayout.cxx
vcl/win/source/window/salframe.cxx
vcl/win/source/window/salobj.cxx
vcl/workben/outdevgrind.cxx
vos/inc/vos/execabl.hxx
vos/inc/vos/macros.hxx
vos/inc/vos/pipe.hxx
vos/inc/vos/process.hxx
vos/inc/vos/refernce.hxx
vos/inc/vos/signal.hxx
vos/inc/vos/socket.hxx
vos/inc/vos/stream.hxx
vos/inc/vos/thread.hxx
vos/source/pipe.cxx
vos/source/process.cxx
vos/source/signal.cxx
vos/source/thread.cxx
vos/source/timer.cxx

1 files changed, 74 insertions, 5 deletions

diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src
index 620411d72ddf..b3b46f5131f7 100644
--- a/padmin/source/padialog.src
+++ b/padmin/source/padialog.src
@@ -29,6 +29,7 @@
 
 ModalDialog RID_FONTIMPORT_DIALOG
 {
+    HelpID = "padmin:ModalDialog:RID_FONTIMPORT_DIALOG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 230 , 185 );
@@ -37,6 +38,7 @@ ModalDialog RID_FONTIMPORT_DIALOG
 
     ListBox RID_FIMP_BOX_NEWFONTS
     {
+        HelpID = "padmin:ListBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_NEWFONTS";
         Border = TRUE;
         Sort=TRUE;
         AutoHScroll = TRUE;
@@ -58,18 +60,21 @@ ModalDialog RID_FONTIMPORT_DIALOG
     };
     Edit RID_FIMP_EDT_FROM
     {
+        HelpID = "padmin:Edit:RID_FONTIMPORT_DIALOG:RID_FIMP_EDT_FROM";
         Border = TRUE;
         Pos = MAP_APPFONT( 10, 97 );
         Size = MAP_APPFONT( 130, 12 );
     };
     PushButton RID_FIMP_BTN_FROM
     {
+        HelpID = "padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_FROM";
         Pos = MAP_APPFONT( 145, 97 );
         Size = MAP_APPFONT( 15, 12 );
         Text = "...";
     };
     CheckBox RID_FIMP_BOX_SUBDIRS
     {
+        HelpID = "padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_SUBDIRS";
         Pos = MAP_APPFONT( 10, 115 );
         Size = MAP_APPFONT( 145, 10 );
         Text [ en-US ] = "Sea~rch Subdirectories";
@@ -83,6 +88,7 @@ ModalDialog RID_FONTIMPORT_DIALOG
 
     CheckBox RID_FIMP_BOX_LINKONLY
     {
+        HelpID = "padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_LINKONLY";
         Pos = MAP_APPFONT( 10, 140 );
         Size = MAP_APPFONT( 145, 10 );
         Text [ en-US ] = "Create ~soft links only";
@@ -100,6 +106,7 @@ ModalDialog RID_FONTIMPORT_DIALOG
     };
     PushButton RID_FIMP_BTN_SELECTALL
     {
+        HelpID = "padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_SELECTALL";
         Pos = MAP_APPFONT( 175, 44 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Select All";
@@ -146,6 +153,7 @@ ModalDialog RID_FONTIMPORT_DIALOG
 
 ModalDialog RID_PADIALOG
 {
+    HelpID = "padmin:ModalDialog:RID_PADIALOG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 198 ) ;
@@ -160,6 +168,7 @@ ModalDialog RID_PADIALOG
     };
     CheckBox RID_PA_CB_CUPSUSAGE
     {
+        HelpID = "padmin:CheckBox:RID_PADIALOG:RID_PA_CB_CUPSUSAGE";
         Pos = MAP_APPFONT( 12, 158 );
         Size = MAP_APPFONT( 168, 8 );
         Text [ en-US ] = "Disable CUPS Support";
@@ -186,6 +195,7 @@ ModalDialog RID_PADIALOG
     };
     ListBox RID_PA_LB_DEV
     {
+        HelpID = "padmin:ListBox:RID_PADIALOG:RID_PA_LB_DEV";
         Pos = MAP_APPFONT( 12, 15 );
         Size = MAP_APPFONT( 168, 80 );
         Border = TRUE;
@@ -237,30 +247,35 @@ ModalDialog RID_PADIALOG
     };
     PushButton RID_PA_BTN_CONF
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_CONF";
         Pos = MAP_APPFONT( 190, 15 );
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "Properties...";
     };
     PushButton RID_PA_BTN_RENAME
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_RENAME";
         Pos = MAP_APPFONT( 190, 32 );
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "R~ename...";
     };
     PushButton RID_PA_BTN_STD
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_STD";
         Pos = MAP_APPFONT( 190, 49 );
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "~Default";
     };
     PushButton RID_PA_BTN_DEL
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_DEL";
         Pos = MAP_APPFONT( 190, 66 );
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "Remo~ve...";
     };
     PushButton RID_PA_TESTPAGE
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_TESTPAGE";
         Pos = MAP_APPFONT( 190, 83 );
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "Test ~Page";
@@ -268,12 +283,14 @@ ModalDialog RID_PADIALOG
 
     PushButton RID_PA_BTN_FONTS
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_FONTS";
         Pos = MAP_APPFONT( 80, 181 );
         Size = MAP_APPFONT( 70, 12 );
         Text [ en-US ] = "Fon~ts...";
     };
     PushButton RID_PA_BTN_ADD
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_ADD";
         Pos = MAP_APPFONT( 5, 181 );
         Size = MAP_APPFONT( 70, 12 );
         Text [ en-US ] = "New Printer...";
@@ -292,6 +309,7 @@ ModalDialog RID_PADIALOG
 
 ModalDialog RID_STRINGQUERYDLG
 {
+    HelpID = "padmin:ModalDialog:RID_STRINGQUERYDLG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 10 , 10 ) ;
@@ -306,12 +324,14 @@ ModalDialog RID_STRINGQUERYDLG
     };
     Edit RID_STRQRY_EDT_NEWNAME
     {
+        HelpID = "padmin:Edit:RID_STRINGQUERYDLG:RID_STRQRY_EDT_NEWNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 23 ) ;
         Size = MAP_APPFONT ( 130 , 12 ) ;
     };
     ComboBox RID_STRQRY_BOX_NEWNAME
     {
+        HelpID = "padmin:ComboBox:RID_STRINGQUERYDLG:RID_STRQRY_BOX_NEWNAME";
         Border = TRUE ;
         DropDown = TRUE;
         Pos = MAP_APPFONT ( 6 , 23 ) ;
@@ -340,6 +360,11 @@ String RID_PA_TXT_TESTPAGE_PRINTED
     Text [ en-US ] = "The test page was printed succesfully. Please check the result.";
 };
 
+String RID_ERR_NOWRITE
+{
+    Text [en-US] = "No printers can be installed, because the file system is read-only.\nPlease contact your system administrator.";
+};
+
 String RID_QRY_PRTNAME
 {
     Text [ en-US ] = "~New printer name";
@@ -378,6 +403,7 @@ String RID_TXT_TESTPAGE_TIME
 
 ModalDialog RID_FONTNAMEDIALOG
 {
+    HelpID = "padmin:ModalDialog:RID_FONTNAMEDIALOG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 255 , 110 ) ;
@@ -392,24 +418,28 @@ ModalDialog RID_FONTNAMEDIALOG
     };
     PushButton RID_FNTNM_BTN_RENAME
     {
+        HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_RENAME";
         Pos = MAP_APPFONT( 196, 31 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "Re~name...";
     };
     PushButton RID_FNTNM_BTN_REMOVE
     {
+        HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_REMOVE";
         Pos = MAP_APPFONT ( 196 , 48 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
         Text [ en-US ] = "~Remove...";
     };
     PushButton RID_FNTNM_BTN_IMPORT
     {
+        HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_IMPORT";
         Pos = MAP_APPFONT ( 196 , 65 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
         Text [ en-US ] = "~Add...";
     };
     ListBox RID_FNTNM_LB_FONTS
     {
+        HelpID = "padmin:ListBox:RID_FONTNAMEDIALOG:RID_FNTNM_LB_FONTS";
         Border = TRUE ;
         Sort = TRUE ;
         AutoHScroll = TRUE;
@@ -455,27 +485,27 @@ String RID_YOU_SURE
 
 Bitmap RID_BUTTERFLY
 {
-    File = "butter.png" ;
+    File = "source/butter.png" ;
 };
 
 Bitmap RID_BMP_SMALL_PRINTER
 {
-    File = "print.png";
+    File = "source/print.png";
 };
 
 Bitmap RID_BMP_SMALL_FAX
 {
-    File = "fax.png";
+    File = "source/fax.png";
 };
 
 Bitmap RID_BMP_SMALL_PDF
 {
-    File = "pdf.png";
+    File = "source/pdf.png";
 };
 
 Bitmap RID_BMP_PRINTER
 {
-    File = "printer_large.png";
+    File = "source/printer_large.png";
 };
 
 String RID_AFMERROR_OK
@@ -525,6 +555,7 @@ String RID_AFMERROR_BOX_TXT
 
 ModelessDialog RID_PROGRESS_DLG
 {
+    HelpID = "padmin:ModelessDialog:RID_PROGRESS_DLG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 10 , 10 ) ;
@@ -570,6 +601,7 @@ String RID_OPERATION_CONVERTMETRIC
 
 ModalDialog RID_PPDIMPORT_DLG
 {
+    HelpID = "padmin:ModalDialog:RID_PPDIMPORT_DLG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 265 , 225 ) ;
@@ -590,6 +622,7 @@ ModalDialog RID_PPDIMPORT_DLG
     };
     ComboBox RID_PPDIMP_LB_PATH
     {
+        HelpID = "padmin:ComboBox:RID_PPDIMPORT_DLG:RID_PPDIMP_LB_PATH";
         Dropdown = TRUE;
         Border = TRUE;
         Sort = TRUE;
@@ -599,6 +632,7 @@ ModalDialog RID_PPDIMPORT_DLG
     };
     PushButton RID_PPDIMP_BTN_SEARCH
     {
+        HelpID = "padmin:PushButton:RID_PPDIMPORT_DLG:RID_PPDIMP_BTN_SEARCH";
         Pos = MAP_APPFONT( 145, 15 );
         Size = MAP_APPFONT( 50, 14 );
         Text [ en-US ] = "Browse...";
@@ -612,6 +646,7 @@ ModalDialog RID_PPDIMPORT_DLG
     };
     MultiListBox RID_PPDIMP_LB_DRIVER
     {
+        HelpID = "padmin:MultiListBox:RID_PPDIMPORT_DLG:RID_PPDIMP_LB_DRIVER";
         Border = TRUE;
         Sort = TRUE;
         SimpleMode = TRUE;
@@ -707,6 +742,7 @@ String RID_TXT_PRINTERADDFAILED
 
 ModalDialog RID_ADD_PRINTER_DIALOG
 {
+    HelpID = "padmin:ModalDialog:RID_ADD_PRINTER_DIALOG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 240 , 172 ) ;
@@ -736,12 +772,14 @@ ModalDialog RID_ADD_PRINTER_DIALOG
     };
     PushButton RID_ADDP_BTN_NEXT
     {
+        HelpID = "padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_NEXT";
         Pos = MAP_APPFONT( 130, 155 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Next >>";
     };
     PushButton RID_ADDP_BTN_PREV
     {
+        HelpID = "padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_PREV";
         Pos = MAP_APPFONT( 75, 155 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "<< ~Back";
@@ -751,6 +789,7 @@ ModalDialog RID_ADD_PRINTER_DIALOG
 
 TabPage RID_ADDP_PAGE_CHOOSEDRIVER
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_CHOOSEDRIVER";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -766,6 +805,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER
     };
     ListBox RID_ADDP_CHDRV_BOX_DRIVER
     {
+        HelpID = "padmin:ListBox:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BOX_DRIVER";
         Pos = MAP_APPFONT( 5, 15 );
         Size = MAP_APPFONT( 175, 100 );
         Border = TRUE;
@@ -773,12 +813,14 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER
     };
     PushButton RID_ADDP_CHDRV_BTN_ADD
     {
+        HelpID = "padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_ADD";
         Pos = MAP_APPFONT( 185, 15 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Import...";
     };
     PushButton RID_ADDP_CHDRV_BTN_REMOVE
     {
+        HelpID = "padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_REMOVE";
         Pos = MAP_APPFONT( 185, 32 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Delete";
@@ -791,6 +833,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER
 
 TabPage RID_ADDP_PAGE_CHOOSEDEV
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_CHOOSEDEV";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -806,24 +849,28 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV
     };
     RadioButton RID_ADDP_CHDEV_BTN_PRINTER
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PRINTER";
         Pos = MAP_APPFONT ( 40, 40 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "Add a ~printer";
     };
     RadioButton RID_ADDP_CHDEV_BTN_FAX
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_FAX";
         Pos = MAP_APPFONT ( 40, 50 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "Connect a fa~x device";
     };
     RadioButton RID_ADDP_CHDEV_BTN_PDF
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PDF";
         Pos = MAP_APPFONT ( 40, 60 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "Connect a P~DF converter";
     };
     RadioButton RID_ADDP_CHDEV_BTN_OLD
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_OLD";
         Pos = MAP_APPFONT ( 40, 70 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "~Import printers from a StarOffice installation";
@@ -832,6 +879,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV
 
 TabPage RID_ADDP_PAGE_NAME
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_NAME";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -859,12 +907,14 @@ TabPage RID_ADDP_PAGE_NAME
     };
     Edit RID_ADDP_NAME_EDT_NAME
     {
+        HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_NAME";
         Pos = MAP_APPFONT( 40, 35 );
         Size = MAP_APPFONT( 160, 12 );
         Border = TRUE;
     };
     Edit RID_ADDP_NAME_EDT_FAXNAME
     {
+        HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_FAXNAME";
         Pos = MAP_APPFONT( 40, 35 );
         Size = MAP_APPFONT( 160, 12 );
         Border = TRUE;
@@ -872,6 +922,7 @@ TabPage RID_ADDP_PAGE_NAME
     };
     Edit RID_ADDP_NAME_EDT_PDFNAME
     {
+        HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_PDFNAME";
         Pos = MAP_APPFONT( 40, 35 );
         Size = MAP_APPFONT( 160, 12 );
         Border = TRUE;
@@ -879,12 +930,14 @@ TabPage RID_ADDP_PAGE_NAME
     };
     CheckBox RID_ADDP_NAME_BOX_DEFAULT
     {
+        HelpID = "padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_DEFAULT";
         Pos = MAP_APPFONT( 40, 50 );
         Size = MAP_APPFONT( 160, 12 );
         Text [ en-US ] = "~Use as default printer";
     };
     CheckBox RID_ADDP_NAME_BOX_FAXSWALLOW
     {
+        HelpID = "padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_FAXSWALLOW";
         Pos = MAP_APPFONT( 40, 50 );
         Size = MAP_APPFONT( 160, 12 );
         Text [ en-US ] = "Remo~ve fax number from output";
@@ -893,6 +946,7 @@ TabPage RID_ADDP_PAGE_NAME
 
 TabPage RID_ADDP_PAGE_COMMAND
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_COMMAND";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -909,12 +963,14 @@ TabPage RID_ADDP_PAGE_COMMAND
     };
     ComboBox RID_ADDP_CMD_BOX_COMMAND
     {
+        HelpID = "padmin:ComboBox:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BOX_COMMAND";
         Pos = MAP_APPFONT( 10, 30);
         Size = MAP_APPFONT( 220, 85 );
         Border = TRUE;
     };
     ComboBox RID_ADDP_CMD_BOX_PDFCOMMAND
     {
+        HelpID = "padmin:ComboBox:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BOX_PDFCOMMAND";
         Pos = MAP_APPFONT( 10, 30);
         Size = MAP_APPFONT( 220, 60 );
         Border = TRUE;
@@ -927,18 +983,21 @@ TabPage RID_ADDP_PAGE_COMMAND
     };
     Edit RID_ADDP_CMD_EDT_PDFDIR
     {
+        HelpID = "padmin:Edit:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_EDT_PDFDIR";
         Border = TRUE;
         Pos = MAP_APPFONT( 10, 104 );
         Size = MAP_APPFONT( 190, 12 );
     };
     PushButton RID_ADDP_CMD_BTN_PDFDIR
     {
+        HelpID = "padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_PDFDIR";
         Pos = MAP_APPFONT( 205, 104 );
         Size = MAP_APPFONT( 25, 12 );
         Text = "~...";
     };
     PushButton RID_ADDP_CMD_BTN_HELP
     {
+        HelpID = "padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_HELP";
         Pos = MAP_APPFONT( 180, 2 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Help";
@@ -955,6 +1014,7 @@ TabPage RID_ADDP_PAGE_COMMAND
 
 TabPage RID_ADDP_PAGE_OLDPRINTERS
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_OLDPRINTERS";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -971,12 +1031,14 @@ TabPage RID_ADDP_PAGE_OLDPRINTERS
     };
     MultiListBox RID_ADDP_OLD_BOX_PRINTERS
     {
+        HelpID = "padmin:MultiListBox:RID_ADDP_PAGE_OLDPRINTERS:RID_ADDP_OLD_BOX_PRINTERS";
         Pos = MAP_APPFONT( 10, 35 );
         Size = MAP_APPFONT( 165, 80 );
         Border = TRUE;
     };
     PushButton RID_ADDP_OLD_BTN_SELECTALL
     {
+        HelpID = "padmin:PushButton:RID_ADDP_PAGE_OLDPRINTERS:RID_ADDP_OLD_BTN_SELECTALL";
         Pos = MAP_APPFONT( 180, 35 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Select All";
@@ -985,6 +1047,7 @@ TabPage RID_ADDP_PAGE_OLDPRINTERS
 
 TabPage RID_ADDP_PAGE_FAXDRIVER
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_FAXDRIVER";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -1001,12 +1064,14 @@ TabPage RID_ADDP_PAGE_FAXDRIVER
     };
     RadioButton RID_ADDP_FAXDRV_BTN_DEFAULT
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_DEFAULT";
         Pos = MAP_APPFONT( 40,40 );
         Size = MAP_APPFONT( 160, 10 );
         Text [ en-US ] = "T~he default driver";
     };
     RadioButton RID_ADDP_FAXDRV_BTN_SELECT
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_SELECT";
         Pos = MAP_APPFONT( 40, 50 );
         Size = MAP_APPFONT( 160,24 );
         Text [ en-US ] = "A speci~fic driver, to adapt the format to another printer";
@@ -1015,6 +1080,7 @@ TabPage RID_ADDP_PAGE_FAXDRIVER
 
 TabPage RID_ADDP_PAGE_PDFDRIVER
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_PDFDRIVER";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -1031,18 +1097,21 @@ TabPage RID_ADDP_PAGE_PDFDRIVER
     };
     RadioButton RID_ADDP_PDFDRV_BTN_DEFAULT
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_DEFAULT";
         Pos = MAP_APPFONT( 40, 40 );
         Size = MAP_APPFONT( 160, 10 );
         Text [ en-US ] = "T~he default driver";
     };
     RadioButton RID_ADDP_PDFDRV_BTN_DIST
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_DIST";
         Pos = MAP_APPFONT( 40,50 );
         Size = MAP_APPFONT( 160, 10 );
         Text [ en-US ] = "The Adobe D~istiller(tm) driver";
     };
     RadioButton RID_ADDP_PDFDRV_BTN_SELECT
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_SELECT";
         Pos = MAP_APPFONT( 40, 60 );
         Size = MAP_APPFONT( 160, 24 );
         Text [ en-US ] = "A spec~ific driver, to adapt the format to another printer";