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

4 files changed, 186 insertions, 239 deletions

diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index ce2e3f7fa36f..9d027780e5df 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.cxx
@@ -50,11 +50,11 @@ struct EDcrData
     ErrorHandler               *pFirstHdl;
     ErrorContext               *pFirstCtx;
     DisplayFnPtr               pDsp;
-    BOOL                       bIsWindowDsp;
+    sal_Bool                       bIsWindowDsp;
 
 
     DynamicErrorInfo            *ppDcr[ERRCODE_DYNAMIC_COUNT];
-    USHORT                      nNextDcr;
+    sal_uInt16                      nNextDcr;
                                 EDcrData();
 
 static  EDcrData                *GetData();
@@ -63,12 +63,12 @@ static  EDcrData                *GetData();
 
 class EDcr_Impl
 {
-    ULONG                       lErrId;
-    USHORT                      nMask;
+    sal_uIntPtr                       lErrId;
+    sal_uInt16                      nMask;
 
     void                        RegisterEDcr(DynamicErrorInfo *);
     void                        UnRegisterEDcr(DynamicErrorInfo *);
-    static ErrorInfo           *GetDynamicErrorInfo(ULONG lId);
+    static ErrorInfo           *GetDynamicErrorInfo(sal_uIntPtr lId);
 
 friend class DynamicErrorInfo;
 friend class ErrorInfo;
@@ -77,7 +77,7 @@ friend class ErrorInfo;
 
 EDcrData::EDcrData()
 {
-    for(USHORT n=0;n<ERRCODE_DYNAMIC_COUNT;n++)
+    for(sal_uInt16 n=0;n<ERRCODE_DYNAMIC_COUNT;n++)
         ppDcr[n]=0;
     nNextDcr=0;
     pFirstHdl=0;
@@ -106,10 +106,10 @@ void EDcr_Impl::RegisterEDcr(DynamicErrorInfo *pDcr)
     //Vergibt eine dynamische Id
 
     EDcrData* pData=EDcrData::GetData();
-    lErrId= (((ULONG)pData->nNextDcr + 1) << ERRCODE_DYNAMIC_SHIFT) +
+    lErrId= (((sal_uIntPtr)pData->nNextDcr + 1) << ERRCODE_DYNAMIC_SHIFT) +
         pDcr->GetErrorCode();
     DynamicErrorInfo **ppDcr=pData->ppDcr;
-    USHORT nNext=pData->nNextDcr;
+    sal_uInt16 nNext=pData->nNextDcr;
 
     // bei einem Ringbuffer koennen wir uns das ASSERT wohl sparen!
     // DBG_ASSERT(ppDcr[nNext]==0,"ErrHdl: Alle Errors belegt");
@@ -128,8 +128,8 @@ void EDcr_Impl::UnRegisterEDcr(DynamicErrorInfo *pDcr)
 
     EDcrData* pData=EDcrData::GetData();
     DynamicErrorInfo **ppDcr=pData->ppDcr;
-    ULONG lIdx=(
-        ((ULONG)(*pDcr) & ERRCODE_DYNAMIC_MASK)>>ERRCODE_DYNAMIC_SHIFT)-1;
+    sal_uIntPtr lIdx=(
+        ((sal_uIntPtr)(*pDcr) & ERRCODE_DYNAMIC_MASK)>>ERRCODE_DYNAMIC_SHIFT)-1;
     DBG_ASSERT(ppDcr[lIdx]==pDcr,"ErrHdl: Error nicht gefunden");
     if(ppDcr[lIdx]==pDcr)
         ppDcr[lIdx]=0;
@@ -143,7 +143,7 @@ TYPEINIT1(TwoStringErrorInfo, DynamicErrorInfo);
 TYPEINIT1(MessageInfo, DynamicErrorInfo);
 
 
-ErrorInfo *ErrorInfo::GetErrorInfo(ULONG lId)
+ErrorInfo *ErrorInfo::GetErrorInfo(sal_uIntPtr lId)
 {
     if(lId & ERRCODE_DYNAMIC_MASK)
         return EDcr_Impl::GetDynamicErrorInfo(lId);
@@ -151,12 +151,12 @@ ErrorInfo *ErrorInfo::GetErrorInfo(ULONG lId)
         return new ErrorInfo(lId);
 }
 
-DynamicErrorInfo::operator ULONG() const
+DynamicErrorInfo::operator sal_uIntPtr() const
 {
     return pImpl->lErrId;
 }
 
-DynamicErrorInfo::DynamicErrorInfo(ULONG lArgUserId, USHORT nMask)
+DynamicErrorInfo::DynamicErrorInfo(sal_uIntPtr lArgUserId, sal_uInt16 nMask)
 : ErrorInfo(lArgUserId)
 {
     pImpl=new EDcr_Impl;
@@ -170,32 +170,32 @@ DynamicErrorInfo::~DynamicErrorInfo()
     delete pImpl;
 }
 
-ErrorInfo* EDcr_Impl::GetDynamicErrorInfo(ULONG lId)
+ErrorInfo* EDcr_Impl::GetDynamicErrorInfo(sal_uIntPtr lId)
 {
-    ULONG lIdx=((lId & ERRCODE_DYNAMIC_MASK)>>ERRCODE_DYNAMIC_SHIFT)-1;
+    sal_uIntPtr lIdx=((lId & ERRCODE_DYNAMIC_MASK)>>ERRCODE_DYNAMIC_SHIFT)-1;
     DynamicErrorInfo* pDcr=EDcrData::GetData()->ppDcr[lIdx];
-    if(pDcr && (ULONG)(*pDcr)==lId)
+    if(pDcr && (sal_uIntPtr)(*pDcr)==lId)
         return pDcr;
     else
         return new ErrorInfo(lId & ~ERRCODE_DYNAMIC_MASK);
 }
 
 
-USHORT DynamicErrorInfo::GetDialogMask() const
+sal_uInt16 DynamicErrorInfo::GetDialogMask() const
 {
     return pImpl->nMask;
 }
 
 
 StandardErrorInfo::StandardErrorInfo(
-    ULONG UserId, ULONG lArgExtId, USHORT nFlags)
+    sal_uIntPtr UserId, sal_uIntPtr lArgExtId, sal_uInt16 nFlags)
 : DynamicErrorInfo(UserId, nFlags), lExtId(lArgExtId)
 {
 }
 
 
 StringErrorInfo::StringErrorInfo(
-    ULONG UserId, const String& aStringP,  USHORT nFlags)
+    sal_uIntPtr UserId, const String& aStringP,  sal_uInt16 nFlags)
 : DynamicErrorInfo(UserId, nFlags), aString(aStringP)
 {
 }
@@ -206,8 +206,8 @@ class ErrHdl_Impl
   public:
 
     ErrorHandler        *pNext;
-    static BOOL         CreateString(const ErrorHandler *pStart,
-                                     const ErrorInfo*, String&, USHORT&);
+    static sal_Bool         CreateString(const ErrorHandler *pStart,
+                                     const ErrorInfo*, String&, sal_uInt16&);
 };
 
 
@@ -268,19 +268,19 @@ ErrorHandler::~ErrorHandler()
 void ErrorHandler::RegisterDisplay(WindowDisplayErrorFunc *aDsp)
 {
     EDcrData *pData=EDcrData::GetData();
-    pData->bIsWindowDsp=TRUE;
+    pData->bIsWindowDsp=sal_True;
     pData->pDsp = reinterpret_cast< DisplayFnPtr >(aDsp);
 }
 
 void ErrorHandler::RegisterDisplay(BasicDisplayErrorFunc *aDsp)
 {
     EDcrData *pData=EDcrData::GetData();
-    pData->bIsWindowDsp=FALSE;
+    pData->bIsWindowDsp=sal_False;
     pData->pDsp = reinterpret_cast< DisplayFnPtr >(aDsp);
 }
 
-USHORT ErrorHandler::HandleError_Impl(
-    ULONG lId, USHORT nFlags, BOOL bJustCreateString, String & rError)
+sal_uInt16 ErrorHandler::HandleError_Impl(
+    sal_uIntPtr lId, sal_uInt16 nFlags, sal_Bool bJustCreateString, String & rError)
 {
 
 /*  [Beschreibung]
@@ -317,8 +317,8 @@ USHORT ErrorHandler::HandleError_Impl(
             break;
         }
 
-    BOOL bWarning = ((lId & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK);
-    USHORT nErrFlags = ERRCODE_BUTTON_DEF_OK | ERRCODE_BUTTON_OK;
+    sal_Bool bWarning = ((lId & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK);
+    sal_uInt16 nErrFlags = ERRCODE_BUTTON_DEF_OK | ERRCODE_BUTTON_OK;
     if (bWarning)
         nErrFlags |= ERRCODE_MSG_WARNING;
     else
@@ -327,7 +327,7 @@ USHORT ErrorHandler::HandleError_Impl(
     DynamicErrorInfo* pDynPtr=PTR_CAST(DynamicErrorInfo,pInfo);
     if(pDynPtr)
     {
-        USHORT nDynFlags = pDynPtr->GetDialogMask();
+        sal_uInt16 nDynFlags = pDynPtr->GetDialogMask();
         if( nDynFlags )
             nErrFlags = nDynFlags;
     }
@@ -380,12 +380,12 @@ USHORT ErrorHandler::HandleError_Impl(
 }
 
 // static
-BOOL ErrorHandler::GetErrorString(ULONG lId, String& rStr)
+sal_Bool ErrorHandler::GetErrorString(sal_uIntPtr lId, String& rStr)
 {
-    return (BOOL)HandleError_Impl( lId, USHRT_MAX, TRUE, rStr );
+    return (sal_Bool)HandleError_Impl( lId, USHRT_MAX, sal_True, rStr );
 }
 
-USHORT ErrorHandler::HandleError(ULONG lId, USHORT nFlags)
+sal_uInt16 ErrorHandler::HandleError(sal_uIntPtr lId, sal_uInt16 nFlags)
 {
 
 /*  [Beschreibung]
@@ -405,30 +405,30 @@ USHORT ErrorHandler::HandleError(ULONG lId, USHORT nFlags)
     */
 
     String aDummy;
-    return HandleError_Impl( lId, nFlags, FALSE, aDummy );
+    return HandleError_Impl( lId, nFlags, sal_False, aDummy );
 }
 
-BOOL ErrorHandler::ForwCreateString(const ErrorInfo* pInfo, String& rStr, USHORT &rFlags) const
+sal_Bool ErrorHandler::ForwCreateString(const ErrorInfo* pInfo, String& rStr, sal_uInt16 &rFlags) const
 {
     return ErrHdl_Impl::CreateString(this->pImpl->pNext, pInfo, rStr, rFlags);
 }
 
-BOOL ErrHdl_Impl::CreateString( const ErrorHandler *pStart,
+sal_Bool ErrHdl_Impl::CreateString( const ErrorHandler *pStart,
                                 const ErrorInfo* pInfo, String& pStr,
-                               USHORT &rFlags)
+                               sal_uInt16 &rFlags)
 {
     for(const ErrorHandler *pHdl=pStart;pHdl;pHdl=pHdl->pImpl->pNext)
     {
         if(pHdl->CreateString( pInfo, pStr, rFlags))
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SimpleErrorHandler::CreateString(
-    const ErrorInfo *pInfo, String &rStr, USHORT &) const
+sal_Bool SimpleErrorHandler::CreateString(
+    const ErrorInfo *pInfo, String &rStr, sal_uInt16 &) const
 {
-    ULONG nId = pInfo->GetErrorCode();
+    sal_uIntPtr nId = pInfo->GetErrorCode();
     ByteString aStr;
     aStr="Id ";
     aStr+=ByteString::CreateFromInt32(nId);
@@ -444,7 +444,7 @@ BOOL SimpleErrorHandler::CreateString(
     if(pDyn)
     {
         aStr+="\nDId ";
-        aStr+=ByteString::CreateFromInt32((ULONG)*pDyn);
+        aStr+=ByteString::CreateFromInt32((sal_uIntPtr)*pDyn);
     }
     StandardErrorInfo *pStd=PTR_CAST(StandardErrorInfo,pInfo);
     if(pStd)
@@ -453,7 +453,7 @@ BOOL SimpleErrorHandler::CreateString(
         aStr+=ByteString::CreateFromInt32(pStd->GetExtendedErrorCode());
     }
     rStr = String( aStr, RTL_TEXTENCODING_ASCII_US );
-    return TRUE;
+    return sal_True;
 }
 
 SimpleErrorHandler::SimpleErrorHandler()
diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx
index c220fbe1af92..05c7709931e6 100644..100755
--- a/tools/source/ref/globname.cxx
+++ b/tools/source/ref/globname.cxx
@@ -53,7 +53,7 @@ ImpSvGlobalName::ImpSvGlobalName( int )
 /*************************************************************************
 |*    ImpSvGlobalName::operator ==()
 *************************************************************************/
-BOOL ImpSvGlobalName::operator == ( const ImpSvGlobalName & rObj ) const
+sal_Bool ImpSvGlobalName::operator == ( const ImpSvGlobalName & rObj ) const
 {
     return !memcmp( szData, rObj.szData, sizeof( szData ) );
 }
@@ -76,10 +76,10 @@ struct _GUID
 struct GUID
 #endif
 {
-    UINT32 Data1;
-    UINT16 Data2;
-    UINT16 Data3;
-    BYTE   Data4[8];
+    sal_uInt32 Data1;
+    sal_uInt16 Data2;
+    sal_uInt16 Data3;
+    sal_uInt8  Data4[8];
 };
 SvGlobalName::SvGlobalName( const CLSID & rId )
 {
@@ -88,9 +88,9 @@ SvGlobalName::SvGlobalName( const CLSID & rId )
     memcpy( pImp->szData, &rId, sizeof( pImp->szData ) );
 }
 
-SvGlobalName::SvGlobalName( UINT32 n1, USHORT n2, USHORT n3,
-                            BYTE b8, BYTE b9, BYTE b10, BYTE b11,
-                            BYTE b12, BYTE b13, BYTE b14, BYTE b15 )
+SvGlobalName::SvGlobalName( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
+                            sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11,
+                            sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 )
 {
     pImp = new ImpSvGlobalName();
     pImp->nRefCount++;
@@ -188,14 +188,14 @@ SvStream& operator >> ( SvStream& rStr, SvGlobalName & rObj )
 /*************************************************************************
 |*    SvGlobalName::operator < ()
 *************************************************************************/
-BOOL SvGlobalName::operator < ( const SvGlobalName & rObj ) const
+sal_Bool SvGlobalName::operator < ( const SvGlobalName & rObj ) const
 {
     int n = memcmp( pImp->szData +6, rObj.pImp->szData +6,
                     sizeof( pImp->szData ) -6);
     if( n < 0 )
-        return TRUE;
+        return sal_True;
     else if( n > 0 )
-        return FALSE;
+        return sal_False;
 
     sal_uInt16 Data2_a;
     memcpy(&Data2_a, pImp->szData+4, sizeof(sal_uInt16));
@@ -204,7 +204,7 @@ BOOL SvGlobalName::operator < ( const SvGlobalName & rObj ) const
     memcpy(&Data2_b, rObj.pImp->szData+4, sizeof(sal_uInt16));
 
     if( Data2_a < Data2_b )
-        return TRUE;
+        return sal_True;
     else if( Data2_a == Data2_b )
     {
         sal_uInt32 Data1_a;
@@ -216,14 +216,14 @@ BOOL SvGlobalName::operator < ( const SvGlobalName & rObj ) const
         return Data1_a  < Data1_b;
     }
     else
-        return FALSE;
+        return sal_False;
 
 }
 
 /*************************************************************************
 |*    SvGlobalName::operator +=()
 *************************************************************************/
-SvGlobalName & SvGlobalName::operator += ( UINT32 n )
+SvGlobalName & SvGlobalName::operator += ( sal_uInt32 n )
 {
     NewImp();
 
@@ -246,7 +246,7 @@ SvGlobalName & SvGlobalName::operator += ( UINT32 n )
 /*************************************************************************
 |*    SvGlobalName::operator ==()
 *************************************************************************/
-BOOL SvGlobalName::operator == ( const SvGlobalName & rObj ) const
+sal_Bool SvGlobalName::operator == ( const SvGlobalName & rObj ) const
 {
     return *pImp == *rObj.pImp;
 }
@@ -260,7 +260,7 @@ void SvGlobalName::MakeFromMemory( void * pData )
 /*************************************************************************
 |*    SvGlobalName::MakeId()
 *************************************************************************/
-BOOL SvGlobalName::MakeId( const String & rIdStr )
+sal_Bool SvGlobalName::MakeId( const String & rIdStr )
 {
     ByteString  aStr( rIdStr, RTL_TEXTENCODING_ASCII_US );
     sal_Char * pStr = (sal_Char *)aStr.GetBuffer();
@@ -268,7 +268,7 @@ BOOL SvGlobalName::MakeId( const String & rIdStr )
       && '-' == pStr[ 8 ]  && '-' == pStr[ 13 ]
       && '-' == pStr[ 18 ] && '-' == pStr[ 23 ] )
     {
-        UINT32 nFirst = 0;
+        sal_uInt32 nFirst = 0;
         int i = 0;
         for( i = 0; i < 8; i++ )
         {
@@ -278,11 +278,11 @@ BOOL SvGlobalName::MakeId( const String & rIdStr )
                 else
                     nFirst = nFirst * 16 + (toupper( *pStr ) - 'A' + 10 );
             else
-                return FALSE;
+                return sal_False;
             pStr++;
         }
 
-        UINT16 nSec = 0;
+        sal_uInt16 nSec = 0;
         pStr++;
         for( i = 0; i < 4; i++ )
         {
@@ -290,13 +290,13 @@ BOOL SvGlobalName::MakeId( const String & rIdStr )
                 if( isdigit( *pStr ) )
                     nSec = nSec * 16 + (*pStr - '0');
                 else
-                    nSec = nSec * 16 + (UINT16)(toupper( *pStr ) - 'A' + 10 );
+                    nSec = nSec * 16 + (sal_uInt16)(toupper( *pStr ) - 'A' + 10 );
             else
-                return FALSE;
+                return sal_False;
             pStr++;
         }
 
-        UINT16 nThird = 0;
+        sal_uInt16 nThird = 0;
         pStr++;
         for( i = 0; i < 4; i++ )
         {
@@ -304,13 +304,13 @@ BOOL SvGlobalName::MakeId( const String & rIdStr )
                 if( isdigit( *pStr ) )
                     nThird = nThird * 16 + (*pStr - '0');
                 else
-                    nThird = nThird * 16 + (UINT16)(toupper( *pStr ) - 'A' + 10 );
+                    nThird = nThird * 16 + (sal_uInt16)(toupper( *pStr ) - 'A' + 10 );
             else
-                return FALSE;
+                return sal_False;
             pStr++;
         }
 
-        BYTE szRemain[ 8 ];
+        sal_Int8 szRemain[ 8 ];
         memset( szRemain, 0, sizeof( szRemain ) );
         pStr++;
         for( i = 0; i < 16; i++ )
@@ -319,9 +319,9 @@ BOOL SvGlobalName::MakeId( const String & rIdStr )
                 if( isdigit( *pStr ) )
                     szRemain[i/2] = szRemain[i/2] * 16 + (*pStr - '0');
                 else
-                    szRemain[i/2] = szRemain[i/2] * 16 + (BYTE)(toupper( *pStr ) - 'A' + 10 );
+                    szRemain[i/2] = szRemain[i/2] * 16 + (sal_Int8)(toupper( *pStr ) - 'A' + 10 );
             else
-                return FALSE;
+                return sal_False;
             pStr++;
             if( i == 3 )
                 pStr++;
@@ -332,9 +332,9 @@ BOOL SvGlobalName::MakeId( const String & rIdStr )
         memcpy(&pImp->szData[4], &nSec, sizeof(nSec));
         memcpy(&pImp->szData[6], &nThird, sizeof(nThird));
         memcpy(&pImp->szData[ 8 ], szRemain, 8);
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -349,7 +349,7 @@ String SvGlobalName::GetctorName() const
     memcpy(&Data1, pImp->szData, sizeof(sal_uInt32));
     sprintf( buf, "0x%8.8" SAL_PRIXUINT32, Data1 );
     aRet += buf;
-    USHORT i;
+    sal_uInt16 i;
     for( i = 4; i < 8; i += 2 )
     {
         aRet += ',';
@@ -380,7 +380,7 @@ String SvGlobalName::GetHexName() const
     sprintf( buf, "%8.8" SAL_PRIXUINT32, Data1 );
     aRet += buf;
     aRet += '-';
-    USHORT i ;
+    sal_uInt16 i ;
     for( i = 4; i < 8; i += 2 )
     {
         sal_uInt16 Data2;
@@ -442,7 +442,7 @@ void SvGlobalNameList::Append( const SvGlobalName & rName )
 /*************************************************************************
 |*    SvGlobalNameList::GetObject()
 *************************************************************************/
-SvGlobalName SvGlobalNameList::GetObject( ULONG nPos )
+SvGlobalName SvGlobalNameList::GetObject( sal_uLong nPos )
 {
     return SvGlobalName(nPos < aList.size() ? aList[nPos] : NULL);
 }
@@ -450,16 +450,16 @@ SvGlobalName SvGlobalNameList::GetObject( ULONG nPos )
 /*************************************************************************
 |*    SvGlobalNameList::IsEntry()
 *************************************************************************/
-BOOL SvGlobalNameList::IsEntry( const SvGlobalName & rName )
+sal_Bool SvGlobalNameList::IsEntry( const SvGlobalName & rName )
 {
     std::vector<ImpSvGlobalName*>::iterator piter;
     for (piter = aList.begin(); piter != aList.end(); ++piter)
     {
         if (*rName.pImp == *(*piter))
-            return true;
+            return sal_True;
     }
 
-    return false;
+    return sal_False;
 }
 
 com::sun::star::uno::Sequence < sal_Int8 > SvGlobalName::GetByteSequence() const
diff --git a/tools/source/ref/makefile.mk b/tools/source/ref/makefile.mk
deleted file mode 100644
index c87f8a740a4f..000000000000
--- a/tools/source/ref/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=ref
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   $(SLO)$/ref.obj      \
-            $(SLO)$/pstm.obj  	\
-            $(SLO)$/globname.obj \
-            $(SLO)$/errinf.obj
-
-OBJFILES=   $(OBJ)$/ref.obj      \
-            $(OBJ)$/pstm.obj  	\
-            $(OBJ)$/globname.obj \
-            $(OBJ)$/errinf.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
index 31c37b3086b6..3def8c1b19c8 100644
--- a/tools/source/ref/pstm.cxx
+++ b/tools/source/ref/pstm.cxx
@@ -38,7 +38,7 @@
 /************************************************************************
 |*    SvClassManager::Register()
 *************************************************************************/
-void SvClassManager::Register( USHORT nClassId, SvCreateInstancePersist pFunc )
+void SvClassManager::Register( sal_uInt16 nClassId, SvCreateInstancePersist pFunc )
 {
 #ifdef DBG_UTIL
     SvCreateInstancePersist p;
@@ -51,7 +51,7 @@ void SvClassManager::Register( USHORT nClassId, SvCreateInstancePersist pFunc )
 /************************************************************************
 |*    SvClassManager::Get()
 *************************************************************************/
-SvCreateInstancePersist SvClassManager::Get( USHORT nClassId )
+SvCreateInstancePersist SvClassManager::Get( sal_uInt16 nClassId )
 {
     Map::const_iterator i(aAssocTable.find(nClassId));
     return i == aAssocTable.end() ? 0 : i->second;
@@ -64,32 +64,32 @@ TYPEINIT0( SvRttiBase );
 
 SvPersistBaseMemberList::SvPersistBaseMemberList(){}
 SvPersistBaseMemberList::SvPersistBaseMemberList(
-    USHORT nInitSz, USHORT nResize )
+    sal_uInt16 nInitSz, sal_uInt16 nResize )
     : SuperSvPersistBaseMemberList( nInitSz, nResize ){}
 
-#define PERSIST_LIST_VER        (BYTE)0
-#define PERSIST_LIST_DBGUTIL    (BYTE)0x80
+#define PERSIST_LIST_VER        (sal_uInt8)0
+#define PERSIST_LIST_DBGUTIL    (sal_uInt8)0x80
 
 /************************************************************************
 |*    SvPersistBaseMemberList::WriteOnlyStreamedObjects()
 *************************************************************************/
 void SvPersistBaseMemberList::WriteObjects( SvPersistStream & rStm,
-                                            BOOL bOnlyStreamed ) const
+                                            sal_Bool bOnlyStreamed ) const
 {
 #ifdef STOR_NO_OPTIMIZE
-    rStm << (BYTE)(PERSIST_LIST_VER | PERSIST_LIST_DBGUTIL);
-    UINT32 nObjPos = rStm.WriteDummyLen();
+    rStm << (sal_uInt8)(PERSIST_LIST_VER | PERSIST_LIST_DBGUTIL);
+    sal_uInt32 nObjPos = rStm.WriteDummyLen();
 #else
-    BYTE bTmp = PERSIST_LIST_VER;
+    sal_uInt8 bTmp = PERSIST_LIST_VER;
     rStm << bTmp;
 #endif
-    UINT32 nCountMember = Count();
-    ULONG  nCountPos = rStm.Tell();
-    UINT32 nWriteCount = 0;
+    sal_uInt32 nCountMember = Count();
+    sal_uIntPtr  nCountPos = rStm.Tell();
+    sal_uInt32 nWriteCount = 0;
     rStm << nCountMember;
     //bloss die Liste nicht veraendern,
     //wegen Seiteneffekten beim Save
-    for( ULONG n = 0; n < nCountMember; n++ )
+    for( sal_uIntPtr n = 0; n < nCountMember; n++ )
     {
         SvPersistBase * pObj = GetObject( n );
         if( !bOnlyStreamed || rStm.IsStreamed( pObj ) )
@@ -101,7 +101,7 @@ void SvPersistBaseMemberList::WriteObjects( SvPersistStream & rStm,
     if( nWriteCount != nCountMember )
     {
         // nicht alle Objekte geschrieben, Count anpassen
-        ULONG nPos = rStm.Tell();
+        sal_uIntPtr nPos = rStm.Tell();
         rStm.Seek( nCountPos );
         rStm << nWriteCount;
         rStm.Seek( nPos );
@@ -127,7 +127,7 @@ SvPersistStream& operator << ( SvPersistStream & rStm,
 SvPersistStream& operator >> ( SvPersistStream & rStm,
                                SvPersistBaseMemberList & rLst )
 {
-    BYTE nVer;
+    sal_uInt8 nVer;
     rStm >> nVer;
 
     if( (nVer & ~PERSIST_LIST_DBGUTIL) != PERSIST_LIST_VER )
@@ -136,13 +136,13 @@ SvPersistStream& operator >> ( SvPersistStream & rStm,
         OSL_FAIL( "persist list, false version" );
     }
 
-    UINT32 nObjLen(0), nObjPos(0);
+    sal_uInt32 nObjLen(0), nObjPos(0);
     if( nVer & PERSIST_LIST_DBGUTIL )
         nObjLen = rStm.ReadLen( &nObjPos );
 
     sal_uInt32 nCount;
     rStm >> nCount;
-    for( ULONG n = 0; n < nCount && rStm.GetError() == SVSTREAM_OK; n++ )
+    for( sal_uIntPtr n = 0; n < nCount && rStm.GetError() == SVSTREAM_OK; n++ )
     {
         SvPersistBase * pObj;
         rStm >> pObj;
@@ -171,7 +171,7 @@ SvPersistStream::SvPersistStream
                                gespeichert werdn k"onnen */
     SvStream * pStream,     /* Dieser Stream wird als Medium genommen, auf
                                dem der PersistStream arbeitet */
-    UINT32 nStartIdxP       /* Ab diesem Index werden die Id's f"ur
+    sal_uInt32 nStartIdxP       /* Ab diesem Index werden die Id's f"ur
                                die Objekte vergeben, er muss gr"osser
                                als Null sein. */
 )
@@ -190,7 +190,7 @@ SvPersistStream::SvPersistStream
 */
 {
     DBG_ASSERT( nStartIdx != 0, "zero index not allowed" );
-    bIsWritable = TRUE;
+    bIsWritable = sal_True;
     if( pStm )
     {
         SetVersion( pStm->GetVersion() );
@@ -228,7 +228,7 @@ SvPersistStream::SvPersistStream
     wenn das erste aus dieser Hierarchie benutzt werden soll.
 */
 {
-    bIsWritable = TRUE;
+    bIsWritable = sal_True;
     if( pStm )
     {
         SetVersion( pStm->GetVersion() );
@@ -282,14 +282,14 @@ void SvPersistStream::SetStream
 }
 
 //=========================================================================
-USHORT SvPersistStream::IsA() const
+sal_uInt16 SvPersistStream::IsA() const
 /*  [Beschreibung]
 
     Gibt den Identifier dieses Streamklasse zur"uck.
 
     [R"uckgabewert]
 
-    USHORT      ID_PERSISTSTREAM wird zur"uckgegeben.
+    sal_uInt16      ID_PERSISTSTREAM wird zur"uckgegeben.
 
 
     [Querverweise]
@@ -314,10 +314,10 @@ void SvPersistStream::ResetError()
 /*************************************************************************
 |*    SvPersistStream::GetData()
 *************************************************************************/
-ULONG SvPersistStream::GetData( void* pData, ULONG nSize )
+sal_uIntPtr SvPersistStream::GetData( void* pData, sal_uIntPtr nSize )
 {
     DBG_ASSERT( pStm, "stream not set" );
-    ULONG nRet = pStm->Read( pData, nSize );
+    sal_uIntPtr nRet = pStm->Read( pData, nSize );
     SetError( pStm->GetError() );
     return nRet;
 }
@@ -325,10 +325,10 @@ ULONG SvPersistStream::GetData( void* pData, ULONG nSize )
 /*************************************************************************
 |*    SvPersistStream::PutData()
 *************************************************************************/
-ULONG SvPersistStream::PutData( const void* pData, ULONG nSize )
+sal_uIntPtr SvPersistStream::PutData( const void* pData, sal_uIntPtr nSize )
 {
     DBG_ASSERT( pStm, "stream not set" );
-    ULONG nRet = pStm->Write( pData, nSize );
+    sal_uIntPtr nRet = pStm->Write( pData, nSize );
     SetError( pStm->GetError() );
     return nRet;
 }
@@ -336,10 +336,10 @@ ULONG SvPersistStream::PutData( const void* pData, ULONG nSize )
 /*************************************************************************
 |*    SvPersistStream::Seek()
 *************************************************************************/
-ULONG SvPersistStream::SeekPos( ULONG nPos )
+sal_uIntPtr SvPersistStream::SeekPos( sal_uIntPtr nPos )
 {
     DBG_ASSERT( pStm, "stream not set" );
-    ULONG nRet = pStm->Seek( nPos );
+    sal_uIntPtr nRet = pStm->Seek( nPos );
     SetError( pStm->GetError() );
     return nRet;
 }
@@ -354,15 +354,15 @@ void SvPersistStream::FlushData()
 /*************************************************************************
 |*    SvPersistStream::GetCurMaxIndex()
 *************************************************************************/
-ULONG SvPersistStream::GetCurMaxIndex( const SvPersistUIdx & rIdx ) const
+sal_uIntPtr SvPersistStream::GetCurMaxIndex( const SvPersistUIdx & rIdx ) const
 {
     // const  bekomme ich nicht den hoechsten Index
     SvPersistUIdx * p = (SvPersistUIdx *)&rIdx;
     // alten merken
-    ULONG nCurIdx = p->GetCurIndex();
+    sal_uIntPtr nCurIdx = p->GetCurIndex();
     p->Last();
     // Bereiche nicht ueberschneiden, deshalb nur groessere Indexe
-    ULONG nMaxIdx = p->GetCurIndex();
+    sal_uIntPtr nMaxIdx = p->GetCurIndex();
     // wieder herstellen
     p->Seek( nCurIdx );
     return nMaxIdx;
@@ -371,9 +371,9 @@ ULONG SvPersistStream::GetCurMaxIndex( const SvPersistUIdx & rIdx ) const
 /*************************************************************************
 |*    SvPersistStream::GetIndex()
 *************************************************************************/
-ULONG SvPersistStream::GetIndex( SvPersistBase * pObj ) const
+sal_uIntPtr SvPersistStream::GetIndex( SvPersistBase * pObj ) const
 {
-    ULONG nId = (ULONG)aPTable.Get( (ULONG)pObj );
+    sal_uIntPtr nId = (sal_uIntPtr)aPTable.Get( (sal_uIntPtr)pObj );
     if( !nId && pRefStm )
         return pRefStm->GetIndex( pObj );
     return nId;
@@ -382,7 +382,7 @@ ULONG SvPersistStream::GetIndex( SvPersistBase * pObj ) const
 /*************************************************************************
 |*    SvPersistStream::GetObject)
 *************************************************************************/
-SvPersistBase * SvPersistStream::GetObject( ULONG nIdx ) const
+SvPersistBase * SvPersistStream::GetObject( sal_uIntPtr nIdx ) const
 {
     if( nIdx >= nStartIdx )
         return aPUIdx.Get( nIdx );
@@ -396,7 +396,7 @@ SvPersistBase * SvPersistStream::GetObject( ULONG nIdx ) const
 #define LEN_2           0x40
 #define LEN_4           0x20
 #define LEN_5           0x10
-UINT32 SvPersistStream::ReadCompressed
+sal_uInt32 SvPersistStream::ReadCompressed
 (
     SvStream & rStm /* Aus diesem Stream werden die komprimierten Daten
                        gelesen */
@@ -408,14 +408,14 @@ UINT32 SvPersistStream::ReadCompressed
 
     [R"uckgabewert]
 
-    UINT32      Das nicht komprimierte Wort wird zur"uckgegeben.
+    sal_uInt32      Das nicht komprimierte Wort wird zur"uckgegeben.
 
     [Querverweise]
 
 */
 {
-    UINT32 nRet(0);
-    BYTE    nMask;
+    sal_uInt32 nRet(0);
+    sal_uInt8   nMask;
     rStm >> nMask;
     if( nMask & LEN_1 )
         nRet = ~LEN_1 & nMask;
@@ -433,7 +433,7 @@ UINT32 SvPersistStream::ReadCompressed
         rStm >> nMask;
         nRet |= nMask;
         nRet <<= 16;
-        USHORT n;
+        sal_uInt16 n;
         rStm >> n;
         nRet |= n;
     }
@@ -459,7 +459,7 @@ void SvPersistStream::WriteCompressed
 (
     SvStream & rStm,/* Aus diesem Stream werden die komprimierten Daten
                        gelesen */
-    UINT32 nVal     /* Dieser Wert wird komprimiert geschrieben */
+    sal_uInt32 nVal     /* Dieser Wert wird komprimiert geschrieben */
 )
 /*  [Beschreibung]
 
@@ -477,30 +477,30 @@ void SvPersistStream::WriteCompressed
 {
 #ifdef STOR_NO_OPTIMIZE
     if( nVal < 0x80 )
-        rStm << (BYTE)(LEN_1 | nVal);
+        rStm << (sal_uInt8)(LEN_1 | nVal);
     else if( nVal < 0x4000 )
     {
-        rStm << (BYTE)(LEN_2 | (nVal >> 8));
-        rStm << (BYTE)nVal;
+        rStm << (sal_uInt8)(LEN_2 | (nVal >> 8));
+        rStm << (sal_uInt8)nVal;
     }
     else if( nVal < 0x20000000 )
     {
-        // hoechstes BYTE
-        rStm << (BYTE)(LEN_4 | (nVal >> 24));
-        // 2. hoechstes BYTE
-        rStm << (BYTE)(nVal >> 16);
-        rStm << (USHORT)(nVal);
+        // hoechstes sal_uInt8
+        rStm << (sal_uInt8)(LEN_4 | (nVal >> 24));
+        // 2. hoechstes sal_uInt8
+        rStm << (sal_uInt8)(nVal >> 16);
+        rStm << (sal_uInt16)(nVal);
     }
     else
 #endif
     {
-        rStm << (BYTE)LEN_5;
+        rStm << (sal_uInt8)LEN_5;
         rStm << nVal;
     }
 }
 
 //=========================================================================
-UINT32 SvPersistStream::WriteDummyLen()
+sal_uInt32 SvPersistStream::WriteDummyLen()
 /*  [Beschreibung]
 
     Die Methode schreibt 4 Byte in den Stream und gibt die Streamposition
@@ -508,11 +508,11 @@ UINT32 SvPersistStream::WriteDummyLen()
 
     [R"uckgabewert]
 
-    UINT32      Die Position hinter der L"angenangabe wird zur"uckgegeben.
+    sal_uInt32      Die Position hinter der L"angenangabe wird zur"uckgegeben.
 
     [Beispiel]
 
-    UINT32 nObjPos = rStm.WriteDummyLen();
+    sal_uInt32 nObjPos = rStm.WriteDummyLen();
     ...
     // Daten schreiben
     ...
@@ -525,13 +525,13 @@ UINT32 SvPersistStream::WriteDummyLen()
 */
 {
 #ifdef DBG_UTIL
-    UINT32 nPos = Tell();
+    sal_uInt32 nPos = Tell();
 #endif
-    UINT32 n0 = 0;
+    sal_uInt32 n0 = 0;
     *this << n0; // wegen Sun sp
     // keine Assertion bei Streamfehler
     DBG_ASSERT( GetError() != SVSTREAM_OK
-                  || (sizeof( UINT32 ) == Tell() -nPos),
+                  || (sizeof( sal_uInt32 ) == Tell() -nPos),
                 "keine 4-Byte fuer Langenangabe" );
     return Tell();
 }
@@ -539,20 +539,20 @@ UINT32 SvPersistStream::WriteDummyLen()
 //=========================================================================
 void SvPersistStream::WriteLen
 (
-    UINT32 nObjPos  /* die Position + 4, an der die L"ange geschrieben
+    sal_uInt32 nObjPos  /* die Position + 4, an der die L"ange geschrieben
                        wird. */
 )
 /*  [Beschreibung]
 
     Die Methode schreibt die Differenz zwischen der aktuellen und
-     nObjPos als UINT32 an die Position nObjPos -4 im Stream. Danach
+     nObjPos als sal_uInt32 an die Position nObjPos -4 im Stream. Danach
     wird der Stream wieder auf die alte Position gestellt.
 
     [Beispiel]
 
     Die Differenz enth"alt nicht die L"angenangabe.
 
-    UINT32 nObjPos = rStm.WriteDummyLen();
+    sal_uInt32 nObjPos = rStm.WriteDummyLen();
     ...
     // Daten schreiben
     ...
@@ -564,19 +564,19 @@ void SvPersistStream::WriteLen
     <SvPersistStream::ReadLen>, <SvPersistStream::WriteDummyLen>
 */
 {
-    UINT32 nPos = Tell();
-    UINT32 nLen = nPos - nObjPos;
+    sal_uInt32 nPos = Tell();
+    sal_uInt32 nLen = nPos - nObjPos;
     // die Laenge mu� im stream 4-Byte betragen
-    Seek( nObjPos - sizeof( UINT32 ) );
+    Seek( nObjPos - sizeof( sal_uInt32 ) );
     // Laenge schreiben
     *this << nLen;
     Seek( nPos );
 }
 
 //=========================================================================
-UINT32 SvPersistStream::ReadLen
+sal_uInt32 SvPersistStream::ReadLen
 (
-    UINT32 * pTestPos   /* Die Position des Streams, nach dem Lesen der
+    sal_uInt32 * pTestPos   /* Die Position des Streams, nach dem Lesen der
                            L"ange, wird zur"uckgegeben. Es darf auch NULL
                            "ubergeben werden. */
 )
@@ -586,7 +586,7 @@ UINT32 SvPersistStream::ReadLen
     und <SvPersistStream::WriteLen> geschrieben wurde.
 */
 {
-    UINT32 nLen;
+    sal_uInt32 nLen;
     *this >> nLen;
     if( pTestPos )
         *pTestPos = Tell();
@@ -596,15 +596,15 @@ UINT32 SvPersistStream::ReadLen
 //=========================================================================
 // Dateirormat abw"arts kompatibel
 #ifdef STOR_NO_OPTIMIZE
-#define P_VER       (BYTE)0x00
+#define P_VER       (sal_uInt8)0x00
 #else
-#define P_VER       (BYTE)0x01
+#define P_VER       (sal_uInt8)0x01
 #endif
-#define P_VER_MASK  (BYTE)0x0F
-#define P_ID_0      (BYTE)0x80
-#define P_OBJ       (BYTE)0x40
-#define P_DBGUTIL   (BYTE)0x20
-#define P_ID        (BYTE)0x10
+#define P_VER_MASK  (sal_uInt8)0x0F
+#define P_ID_0      (sal_uInt8)0x80
+#define P_OBJ       (sal_uInt8)0x40
+#define P_DBGUTIL   (sal_uInt8)0x20
+#define P_ID        (sal_uInt8)0x10
 #ifdef STOR_NO_OPTIMIZE
 #define P_STD   P_DBGUTIL
 #else
@@ -614,9 +614,9 @@ UINT32 SvPersistStream::ReadLen
 static void WriteId
 (
     SvStream & rStm,
-    BYTE nHdr,
-    UINT32 nId,
-    USHORT nClassId
+    sal_uInt8 nHdr,
+    sal_uInt32 nId,
+    sal_uInt16 nClassId
 )
 {
 #ifdef STOR_NO_OPTIMIZE
@@ -627,12 +627,12 @@ static void WriteId
     {
         if( (nHdr & P_OBJ) || nId != 0 )
         { // Id nur bei Zeiger, oder DBGUTIL
-            rStm << (BYTE)(nHdr);
+            rStm << (sal_uInt8)(nHdr);
             SvPersistStream::WriteCompressed( rStm, nId );
         }
         else
         { // NULL Pointer
-            rStm << (BYTE)(nHdr | P_ID_0);
+            rStm << (sal_uInt8)(nHdr | P_ID_0);
             return;
         }
     }
@@ -649,9 +649,9 @@ static void WriteId
 static void ReadId
 (
     SvStream & rStm,
-    BYTE & nHdr,
-    UINT32 & nId,
-    USHORT & nClassId
+    sal_uInt8 & nHdr,
+    sal_uInt32 & nId,
+    sal_uInt16 & nClassId
 )
 {
     nClassId = 0;
@@ -671,19 +671,19 @@ static void ReadId
             nId = SvPersistStream::ReadCompressed( rStm );
 
         if( (nHdr & P_DBGUTIL) || (nHdr & P_OBJ) )
-            nClassId = (USHORT)SvPersistStream::ReadCompressed( rStm );
+            nClassId = (sal_uInt16)SvPersistStream::ReadCompressed( rStm );
     }
 }
 
 //=========================================================================
 void SvPersistStream::WriteObj
 (
-    BYTE nHdr,
+    sal_uInt8 nHdr,
     SvPersistBase * pObj
 )
 {
 #ifdef STOR_NO_OPTIMIZE
-    UINT32 nObjPos = 0;
+    sal_uInt32 nObjPos = 0;
     if( nHdr & P_DBGUTIL )
         // Position fuer Laenge merken
         nObjPos = WriteDummyLen();
@@ -701,17 +701,17 @@ SvPersistStream& SvPersistStream::WritePointer
     SvPersistBase * pObj
 )
 {
-    BYTE nP = P_STD;
+    sal_uInt8 nP = P_STD;
 
     if( pObj )
     {
-        ULONG nId = GetIndex( pObj );
+        sal_uIntPtr nId = GetIndex( pObj );
         if( nId )
             nP |= P_ID;
         else
         {
             nId = aPUIdx.Insert( pObj );
-            aPTable.Insert( (ULONG)pObj, (void *)nId );
+            aPTable.Insert( (sal_uIntPtr)pObj, (void *)nId );
             nP |= P_OBJ;
         }
         WriteId( *this, nP, nId, pObj->GetClassId() );
@@ -726,15 +726,15 @@ SvPersistStream& SvPersistStream::WritePointer
 }
 
 //=========================================================================
-UINT32 SvPersistStream::ReadObj
+sal_uInt32 SvPersistStream::ReadObj
 (
     SvPersistBase * &   rpObj,
-    BOOL                bRegister
+    sal_Bool                bRegister
 )
 {
-    BYTE    nHdr;
-    UINT32  nId = 0;
-    USHORT  nClassId;
+    sal_uInt8   nHdr;
+    sal_uInt32  nId = 0;
+    sal_uInt16  nClassId;
 
     rpObj = NULL;   // Spezifikation: Im Fehlerfall 0.
     ReadId( *this, nHdr, nId, nClassId );
@@ -754,7 +754,7 @@ UINT32 SvPersistStream::ReadObj
                         "object already exist" );
             SvCreateInstancePersist pFunc = rClassMgr.Get( nClassId );
 
-            UINT32 nObjLen(0), nObjPos(0);
+            sal_uInt32 nObjLen(0), nObjPos(0);
             if( nHdr & P_DBGUTIL )
                 nObjLen = ReadLen( &nObjPos );
             if( !pFunc )
@@ -777,9 +777,9 @@ UINT32 SvPersistStream::ReadObj
             if( bRegister )
             {
                 // unbedingt erst in Tabelle eintragen
-                ULONG nNewId = aPUIdx.Insert( rpObj );
+                sal_uIntPtr nNewId = aPUIdx.Insert( rpObj );
                 // um den gleichen Zustand, wie nach dem Speichern herzustellen
-                aPTable.Insert( (ULONG)rpObj, (void *)nNewId );
+                aPTable.Insert( (sal_uIntPtr)rpObj, (void *)nNewId );
                 DBG_ASSERT( !(nHdr & P_DBGUTIL) || nId == nNewId,
                             "read write id conflict: not the same" );
             }
@@ -814,7 +814,7 @@ SvPersistStream& SvPersistStream::ReadPointer
     SvPersistBase * & rpObj
 )
 {
-    ReadObj( rpObj, TRUE );
+    ReadObj( rpObj, sal_True );
     return *this;
 }
 
@@ -848,14 +848,14 @@ SvStream& operator <<
     SvStream * pOldStm = rThis.GetStream();
     rThis.SetStream( &rStm );
 
-    BYTE bTmp = 0;
+    sal_uInt8 bTmp = 0;
     rThis << bTmp;    // Version
-    UINT32 nCount = (UINT32)rThis.aPUIdx.Count();
+    sal_uInt32 nCount = (sal_uInt32)rThis.aPUIdx.Count();
     rThis << nCount;
     SvPersistBase * pEle = rThis.aPUIdx.First();
-    for( UINT32 i = 0; i < nCount; i++ )
+    for( sal_uInt32 i = 0; i < nCount; i++ )
     {
-        BYTE nP = P_OBJ | P_ID | P_STD;
+        sal_uInt8 nP = P_OBJ | P_ID | P_STD;
         WriteId( rThis, nP, rThis.aPUIdx.GetCurIndex(),
                         pEle->GetClassId() );
         rThis.WriteObj( nP, pEle );
@@ -875,23 +875,23 @@ SvStream& operator >>
     SvStream * pOldStm = rThis.GetStream();
     rThis.SetStream( &rStm );
 
-    BYTE nVers;
+    sal_uInt8 nVers;
     rThis >> nVers;    // Version
     if( 0 == nVers )
     {
-        UINT32 nCount = 0;
+        sal_uInt32 nCount = 0;
         rThis >> nCount;
-        for( UINT32 i = 0; i < nCount; i++ )
+        for( sal_uInt32 i = 0; i < nCount; i++ )
         {
             SvPersistBase * pEle;
             // Lesen, ohne in die Tabellen einzutragen
-            sal_uIntPtr nId = rThis.ReadObj( pEle, FALSE );
+            sal_uIntPtr nId = rThis.ReadObj( pEle, sal_False );
             if( rThis.GetError() )
                 break;
 
             // Die Id eines Objektes wird nie modifiziert
             rThis.aPUIdx.Insert( nId, pEle );
-            rThis.aPTable.Insert( (ULONG)pEle, (void *)nId );
+            rThis.aPTable.Insert( (sal_uIntPtr)pEle, (void *)nId );
         }
     }
     else
@@ -902,19 +902,19 @@ SvStream& operator >>
 }
 
 //=========================================================================
-ULONG SvPersistStream::InsertObj( SvPersistBase * pObj )
+sal_uIntPtr SvPersistStream::InsertObj( SvPersistBase * pObj )
 {
-    ULONG nId = aPUIdx.Insert( pObj );
-    aPTable.Insert( (ULONG)pObj, (void *)nId );
+    sal_uIntPtr nId = aPUIdx.Insert( pObj );
+    aPTable.Insert( (sal_uIntPtr)pObj, (void *)nId );
     return nId;
 }
 
 //=========================================================================
-ULONG SvPersistStream::RemoveObj( SvPersistBase * pObj )
+sal_uIntPtr SvPersistStream::RemoveObj( SvPersistBase * pObj )
 {
-    ULONG nIdx = GetIndex( pObj );
+    sal_uIntPtr nIdx = GetIndex( pObj );
     aPUIdx.Remove( nIdx );
-    aPTable.Remove( (ULONG)pObj );
+    aPTable.Remove( (sal_uIntPtr)pObj );
     return nIdx;
 }