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, 101 insertions, 101 deletions

diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 17b719298132..3bbfae5c6b5d 100644..100755
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -128,11 +128,11 @@ int Sys2SolarError_Impl( int nSysErr )
 #ifndef BOOTSTRAP
 
 FSysRedirector* FSysRedirector::_pRedirector = 0;
-BOOL FSysRedirector::_bEnabled = TRUE;
+sal_Bool FSysRedirector::_bEnabled = sal_True;
 #ifdef UNX
-BOOL bInRedirection = TRUE;
+sal_Bool bInRedirection = sal_True;
 #else
-BOOL bInRedirection = FALSE;
+sal_Bool bInRedirection = sal_False;
 #endif
 static osl::Mutex* pRedirectMutex = 0;
 
@@ -170,7 +170,7 @@ void FSysRedirector::DoRedirect( String &rPath )
                 return;
 
         // dont redirect on nested calls
-        bInRedirection = TRUE;
+        bInRedirection = sal_True;
 
         // convert to URL
 #ifndef UNX
@@ -184,7 +184,7 @@ void FSysRedirector::DoRedirect( String &rPath )
         // do redirection
         Redirector();
 
-        bInRedirection = FALSE;
+        bInRedirection = sal_False;
         return;
 }
 
@@ -279,12 +279,12 @@ const char* ImpCheckDirEntry( const void* p )
 |*
 *************************************************************************/
 
-ByteString ImplCutPath( const ByteString& rStr, USHORT nMax, char cAccDel )
+ByteString ImplCutPath( const ByteString& rStr, sal_uInt16 nMax, char cAccDel )
 {
-    USHORT  nMaxPathLen = nMax;
+    sal_uInt16  nMaxPathLen = nMax;
     ByteString  aCutPath( rStr );
-    BOOL    bInsertPrefix = FALSE;
-    USHORT  nBegin = aCutPath.Search( cAccDel );
+    sal_Bool    bInsertPrefix = sal_False;
+    sal_uInt16  nBegin = aCutPath.Search( cAccDel );
 
     if( nBegin == STRING_NOTFOUND )
         nBegin = 0;
@@ -293,14 +293,14 @@ ByteString ImplCutPath( const ByteString& rStr, USHORT nMax, char cAccDel )
 
     while( aCutPath.Len() > nMaxPathLen )
     {
-        USHORT nEnd = aCutPath.Search( cAccDel, nBegin + 1 );
-        USHORT nCount;
+        sal_uInt16 nEnd = aCutPath.Search( cAccDel, nBegin + 1 );
+        sal_uInt16 nCount;
 
         if ( nEnd != STRING_NOTFOUND )
         {
             nCount = nEnd - nBegin;
             aCutPath.Erase( nBegin, nCount );
-            bInsertPrefix = TRUE;
+            bInsertPrefix = sal_True;
         }
         else
             break;
@@ -308,7 +308,7 @@ ByteString ImplCutPath( const ByteString& rStr, USHORT nMax, char cAccDel )
 
     if ( aCutPath.Len() > nMaxPathLen )
     {
-        for ( USHORT n = nMaxPathLen; n > nMaxPathLen/2; --n )
+        for ( sal_uInt16 n = nMaxPathLen; n > nMaxPathLen/2; --n )
             if ( !ByteString(aCutPath.GetChar(n)).IsAlphaNumericAscii() )
             {
                 aCutPath.Erase( n );
@@ -348,7 +348,7 @@ FSysError DirEntry::ImpParseOs2Name( const ByteString& rPfad, FSysPathStyle eSty
         // der Rest immer ohne die fuehrenden '\\'.
         // ein ":" trennt ebenfalls, gehoert aber zum Namen
         // den ersten '\\', '/' oder ':' suchen
-        USHORT nPos;
+        sal_uInt16 nPos;
         for ( nPos = 0;
               nPos < aPfad.Len() &&                             //?O
                   aPfad.GetChar(nPos) != '\\' && aPfad.GetChar(nPos) != '/' &&      //?O
@@ -485,7 +485,7 @@ FSysError DirEntry::ImpParseOs2Name( const ByteString& rPfad, FSysPathStyle eSty
     }
     while ( aPfad.Len() );
 
-    ULONG nErr = ERRCODE_NONE;
+    sal_uIntPtr nErr = ERRCODE_NONE;
     // Haupt-Entry (selbst) zuweisen
     if ( aStack.Count() == 0 )
     {
@@ -615,7 +615,7 @@ void DirEntry::ImpTrim( FSysPathStyle eStyle )
     {
         case FSYS_STYLE_FAT:
         {
-            USHORT nPunktPos = aName.Search( '.' );
+            sal_uInt16 nPunktPos = aName.Search( '.' );
             if ( nPunktPos == STRING_NOTFOUND )
             {
                 if ( aName.Len() > 8 )
@@ -930,7 +930,7 @@ DirEntry* DirEntry::ImpGetTopPtr()
 |*
 *************************************************************************/
 
-DirEntry* DirEntry::ImpChangeParent( DirEntry* pNewParent, BOOL bNormalize )
+DirEntry* DirEntry::ImpChangeParent( DirEntry* pNewParent, sal_Bool bNormalize )
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
@@ -953,14 +953,14 @@ DirEntry* DirEntry::ImpChangeParent( DirEntry* pNewParent, BOOL bNormalize )
 |*
 *************************************************************************/
 
-BOOL DirEntry::Exists( FSysAccess nAccess ) const
+sal_Bool DirEntry::Exists( FSysAccess nAccess ) const
 {
 #ifndef BOOTSTRAP
     static osl::Mutex aLocalMutex;
     osl::MutexGuard aGuard( aLocalMutex );
 #endif
         if ( !IsValid() )
-                return FALSE;
+                return sal_False;
 
 #if defined WNT || defined OS2
     // spezielle Filenamen sind vom System da
@@ -976,14 +976,14 @@ BOOL DirEntry::Exists( FSysAccess nAccess ) const
            aName.CompareIgnoreCaseToAscii("LPT3") == COMPARE_EQUAL ||
            aName.CompareIgnoreCaseToAscii("NUL") == COMPARE_EQUAL ||
            aName.CompareIgnoreCaseToAscii("PRN") == COMPARE_EQUAL ) )
-        return TRUE;
+        return sal_True;
 #endif
 
         FSysFailOnErrorImpl();
         DirEntryKind eKind = FileStat( *this, nAccess ).GetKind();
         if ( eKind & ( FSYS_KIND_FILE | FSYS_KIND_DIR ) )
         {
-                return TRUE;
+                return sal_True;
         }
 
 #if defined WNT || defined OS2
@@ -1002,7 +1002,7 @@ BOOL DirEntry::Exists( FSysAccess nAccess ) const
 |*
 *************************************************************************/
 
-BOOL DirEntry::First()
+sal_Bool DirEntry::First()
 {
     FSysFailOnErrorImpl();
 
@@ -1032,12 +1032,12 @@ BOOL DirEntry::First()
                         {
                                 aName = aFound;
                                 closedir( pDir );
-                                return TRUE;
+                                return sal_True;
                         }
                 }
                 closedir( pDir );
         }
-        return FALSE;
+        return sal_False;
 }
 
 /*************************************************************************
@@ -1046,8 +1046,8 @@ BOOL DirEntry::First()
 |*
 *************************************************************************/
 
-String DirEntry::GetFull( FSysPathStyle eStyle, BOOL bWithDelimiter,
-                          USHORT nMaxChars ) const
+String DirEntry::GetFull( FSysPathStyle eStyle, sal_Bool bWithDelimiter,
+                          sal_uInt16 nMaxChars ) const
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
@@ -1341,18 +1341,18 @@ StringCompare DirEntry::NameCompare( const DirEntry &rWith ) const
 |*
 *************************************************************************/
 
-BOOL DirEntry::operator==( const DirEntry& rEntry ) const
+sal_Bool DirEntry::operator==( const DirEntry& rEntry ) const
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
     // test wheather the contents are textual the same
 
     if ( nError && ( nError == rEntry.nError ) )
-        return TRUE;
+        return sal_True;
     if ( nError || rEntry.nError ||
          ( eFlag == FSYS_FLAG_INVALID ) ||
          ( rEntry.eFlag == FSYS_FLAG_INVALID ) )
-        return FALSE;
+        return sal_False;
 
 #ifndef OS2
     const
@@ -1417,10 +1417,10 @@ DirEntry DirEntry::operator+( const DirEntry& rEntry ) const
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 #ifdef DBG_UTIL
-        static BOOL bTested = FALSE;
+        static sal_Bool bTested = sal_False;
         if ( !bTested )
         {
-                bTested = TRUE;
+                bTested = sal_True;
                 FSysTest();
         }
 #endif
@@ -1442,7 +1442,7 @@ DirEntry DirEntry::operator+( const DirEntry& rEntry ) const
         (eFlag == FSYS_FLAG_RELROOT && !aName.Len()) ||
         (
          (pEntryTop->aName.Len()  ||
-          ((rEntry.Level()>1)?(rEntry[rEntry.Level()-2].aName.CompareIgnoreCaseToAscii(RFS_IDENTIFIER)==COMPARE_EQUAL):FALSE))
+          ((rEntry.Level()>1)?(rEntry[rEntry.Level()-2].aName.CompareIgnoreCaseToAscii(RFS_IDENTIFIER)==COMPARE_EQUAL):sal_False))
           &&
          (pEntryTop->eFlag == FSYS_FLAG_ABSROOT ||
           pEntryTop->eFlag == FSYS_FLAG_RELROOT ||
@@ -1613,23 +1613,23 @@ void DirEntry::SetName( const String& rName, FSysPathStyle eFormatter )
 |*    DirEntry::Find()
 |*
 *************************************************************************/
-BOOL DirEntry::Find( const String& rPfad, char cDelim )
+sal_Bool DirEntry::Find( const String& rPfad, char cDelim )
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
         if ( ImpGetTopPtr()->eFlag == FSYS_FLAG_ABSROOT )
-                return TRUE;
+                return sal_True;
 
-        BOOL bWild = aName.Search( '*' ) != STRING_NOTFOUND ||
+        sal_Bool bWild = aName.Search( '*' ) != STRING_NOTFOUND ||
                                  aName.Search( '?' ) != STRING_NOTFOUND;
         if ( !cDelim )
                 cDelim = SEARCHDELIM(DEFSTYLE)[0];
 
-        USHORT nTokenCount = rPfad.GetTokenCount( cDelim );
-        USHORT nIndex = 0;
+        sal_uInt16 nTokenCount = rPfad.GetTokenCount( cDelim );
+        sal_uInt16 nIndex = 0;
         ByteString aThis = ACCESSDELIM(DEFSTYLE);
         aThis += ByteString(GetFull(), osl_getThreadTextEncoding());
-        for ( USHORT nToken = 0; nToken < nTokenCount; ++nToken )
+        for ( sal_uInt16 nToken = 0; nToken < nTokenCount; ++nToken )
         {
             ByteString aPath = ByteString(rPfad, osl_getThreadTextEncoding()).GetToken( 0, cDelim, nIndex );
 
@@ -1643,11 +1643,11 @@ BOOL DirEntry::Find( const String& rPfad, char cDelim )
                          ( ( !bWild && aEntry.Exists() ) || ( bWild && aEntry.First() ) ) )
                 {
                         (*this) = aEntry;
-                        return TRUE;
+                        return sal_True;
                 }
             }
         }
-        return FALSE;
+        return sal_False;
 }
 
 /*************************************************************************
@@ -1656,7 +1656,7 @@ BOOL DirEntry::Find( const String& rPfad, char cDelim )
 |*
 *************************************************************************/
 
-BOOL DirEntry::ImpToRel( String aCurStr )
+sal_Bool DirEntry::ImpToRel( String aCurStr )
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
@@ -1673,7 +1673,7 @@ BOOL DirEntry::ImpToRel( String aCurStr )
     }
 
     // "Ubereinstimmung pr"ufen
-    USHORT nPos = aThisCompareStr.Match( aCurCompareStr );
+    sal_uInt16 nPos = aThisCompareStr.Match( aCurCompareStr );
     if ( nPos == STRING_MATCH && aThisStr.Len() != aCurStr.Len() )
         nPos = Min( aThisStr.Len(), aCurStr.Len() );
 
@@ -1682,7 +1682,7 @@ BOOL DirEntry::ImpToRel( String aCurStr )
     {
         // dann ist der relative Pfad das aktuelle Verzeichnis
         *this = DirEntry();
-        return TRUE;
+        return sal_True;
     }
 
     // Sonderfall, die DirEntries sind total verschieden
@@ -1690,7 +1690,7 @@ BOOL DirEntry::ImpToRel( String aCurStr )
     {
         // dann ist der relativste Pfad absolut
         *this = aThis;
-        return FALSE;
+        return sal_False;
     }
 
     // sonst nehmen wir die identischen Einzelteile vorne weg
@@ -1706,7 +1706,7 @@ BOOL DirEntry::ImpToRel( String aCurStr )
 
     // das ist dann unser relativer Pfad
     *this = DirEntry( aThisStr, FSYS_STYLE_HPFS );
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -1715,7 +1715,7 @@ BOOL DirEntry::ImpToRel( String aCurStr )
 |*
 *************************************************************************/
 
-USHORT DirEntry::CutRelParents()
+sal_uInt16 DirEntry::CutRelParents()
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
@@ -1729,7 +1729,7 @@ USHORT DirEntry::CutRelParents()
         pDir = pPar;
 
     // '..' zaehlen
-    USHORT nParCount = 0;
+    sal_uInt16 nParCount = 0;
     while ( pPar && pPar->eFlag == FSYS_FLAG_PARENT )
     {
         ++nParCount;
@@ -1751,7 +1751,7 @@ USHORT DirEntry::CutRelParents()
 |*
 *************************************************************************/
 
-BOOL DirEntry::ToRel()
+sal_Bool DirEntry::ToRel()
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
@@ -1766,7 +1766,7 @@ BOOL DirEntry::ToRel()
 |*
 *************************************************************************/
 
-BOOL DirEntry::ToRel( const DirEntry& rStart )
+sal_Bool DirEntry::ToRel( const DirEntry& rStart )
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
@@ -1846,7 +1846,7 @@ String DirEntry::GetSearchDelimiter( FSysPathStyle eFormatter )
 |*
 *************************************************************************/
 
-USHORT DirEntry::GetMaxNameLen( FSysPathStyle eFormatter )
+sal_uInt16 DirEntry::GetMaxNameLen( FSysPathStyle eFormatter )
 {
     eFormatter = GetStyle( eFormatter );
     switch ( eFormatter )
@@ -1889,7 +1889,7 @@ const DirEntry& DirEntry::SetTempNameBase( const String &rBase )
         {
             // Create the directory and only on success give all rights to
             // everyone. Use mkdir instead of DirEntry::MakeDir because
-            // this returns TRUE even if directory already exists.
+            // this returns sal_True even if directory already exists.
 
             if ( !mkdir( aName.GetBuffer(), S_IRWXU | S_IRWXG | S_IRWXO ) )
                 chmod( aName.GetBuffer(), S_IRWXU | S_IRWXG | S_IRWXO );
@@ -2066,7 +2066,7 @@ DirEntry DirEntry::TempName( DirEntryKind eKind ) const
 |*
 *************************************************************************/
 
-const DirEntry &DirEntry::operator[]( USHORT nParentLevel ) const
+const DirEntry &DirEntry::operator[]( sal_uInt16 nParentLevel ) const
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
@@ -2098,7 +2098,7 @@ FSysError DirEntry::ImpParseUnixName( const ByteString& rPfad, FSysPathStyle eSt
         // falls '/' am Anfang, ist der Name '/',
         // der Rest immer ohne die fuehrenden '/'.
         // den ersten '/' suchen
-        USHORT nPos;
+        sal_uInt16 nPos;
         for ( nPos = 0;
               nPos < aPfad.Len() && aPfad.GetChar(nPos) != '/';
               nPos++ )
@@ -2124,8 +2124,8 @@ FSysError DirEntry::ImpParseUnixName( const ByteString& rPfad, FSysPathStyle eSt
                         else if ( aName == "~" )
                         {
                                 DirEntry aHome( String( (const char *) getenv( "HOME" ), osl_getThreadTextEncoding()) );
-                                for ( USHORT n = aHome.Level(); n; --n )
-                                        aStack.Push( new DirEntry( aHome[ (USHORT) n-1 ] ) );
+                                for ( sal_uInt16 n = aHome.Level(); n; --n )
+                                        aStack.Push( new DirEntry( aHome[ (sal_uInt16) n-1 ] ) );
                         }
 #endif
 
@@ -2226,11 +2226,11 @@ ErrCode CreateEntry_Impl( const DirEntry &rPath, DirEntryKind eKind )
     return eErr;
 }
 
-BOOL IsValidEntry_Impl( const DirEntry &rPath,
+sal_Bool IsValidEntry_Impl( const DirEntry &rPath,
                         const String &rLongName,
                         DirEntryKind eKind,
-                        BOOL bIsShortened,
-                        BOOL bUseDelim )
+                        sal_Bool bIsShortened,
+                        sal_Bool bUseDelim )
 {
     // Parameter-Pr"uefung
     DBG_ASSERT( eKind == FSYS_KIND_NONE || eKind == FSYS_KIND_ALL ||
@@ -2244,16 +2244,16 @@ BOOL IsValidEntry_Impl( const DirEntry &rPath,
     DirEntry aPath(rPath);
     DirEntry aName(rLongName, eStyle);
     if ( !aName.IsValid() || aName.Level() != 1 )
-        return FALSE;
+        return sal_False;
     aPath += aName;
     if ( 1 == aPath.Level() )
-        return FALSE;
+        return sal_False;
     if ( eStyle == FSYS_STYLE_FAT || eStyle == FSYS_STYLE_NWFS ||
          eStyle == FSYS_STYLE_UNKNOWN )
     {
         DirEntry aDosEntry( rLongName, FSYS_STYLE_FAT );
         if ( !aDosEntry.IsValid() )
-            return FALSE;
+            return sal_False;
     }
 
         // Pfad-Trenner sind nicht erlaubt (bei ungek"urzten auch nicht FSYS_SHORTNAME_DELIMITER)
@@ -2263,12 +2263,12 @@ BOOL IsValidEntry_Impl( const DirEntry &rPath,
          (!bIsShortened && rLongName.Search(cDelim) != STRING_NOTFOUND)
        )
     {
-        return FALSE;
+        return sal_False;
     }
 
     // MI: Abfrage nach 'CON:' etc. wird jetzt in Exists() mitgemacht
     if ( aPath.Exists() )
-        return FALSE;
+        return sal_False;
 
     return (ERRCODE_NONE == CreateEntry_Impl( aPath, eKind ));
 }
@@ -2287,8 +2287,8 @@ BOOL IsValidEntry_Impl( const DirEntry &rPath,
 #define MAX_LEN_MAX       255
 #define INVALID_CHARS_DEF   "\\/\"':|^<>?*"
 
-BOOL DirEntry::MakeShortName( const String& rLongName, DirEntryKind eKind,
-                              BOOL bUseDelim, FSysPathStyle eStyle )
+sal_Bool DirEntry::MakeShortName( const String& rLongName, DirEntryKind eKind,
+                              sal_Bool bUseDelim, FSysPathStyle eStyle )
 {
         String aLongName(rLongName);
 
@@ -2308,14 +2308,14 @@ BOOL DirEntry::MakeShortName( const String& rLongName, DirEntryKind eKind,
         }
 
         // ist der Langname direkt verwendbar?
-        if ( IsValidEntry_Impl( *this, aLongName, eKind, FALSE, bUseDelim ) )
+        if ( IsValidEntry_Impl( *this, aLongName, eKind, sal_False, bUseDelim ) )
         {
             operator+=( DirEntry(aLongName) );
-            return TRUE;
+            return sal_True;
         }
 
         // max L"angen feststellen
-        USHORT nMaxExt, nMaxLen;
+        sal_uInt16 nMaxExt, nMaxLen;
         if ( FSYS_STYLE_DETECT == eStyle )
             eStyle = DirEntry::GetPathStyle( GetDevice().GetName() );
         ByteString aInvalidChars;
@@ -2387,11 +2387,11 @@ BOOL DirEntry::MakeShortName( const String& rLongName, DirEntryKind eKind,
         operator+=( DirEntry(String(aNewName, osl_getThreadTextEncoding())) );
         if ( FSYS_KIND_ALL == eKind && CMP_LOWER(aName) == aOldName )
         if ( FSYS_KIND_ALL == eKind && CMP_LOWER(ByteString(GetName(), osl_getThreadTextEncoding())) == aOldName )
-            return TRUE;
+            return sal_True;
 
         // kann der gek"urzte Name direkt verwendet werden?
         if ( !Exists() && (ERRCODE_NONE == CreateEntry_Impl( *this, eKind )) )
-            return TRUE;
+            return sal_True;
 
         // darf '?##' verwendet werden, um eindeutigen Name zu erzeugen?
         if ( bUseDelim )
@@ -2422,7 +2422,7 @@ BOOL DirEntry::MakeShortName( const String& rLongName, DirEntryKind eKind,
 
         // keine ## mehr frei / ?## soll nicht verwendet werden
         nError = ERRCODE_IO_ALREADYEXISTS;
-        return FALSE;
+        return sal_False;
 }
 
 /*************************************************************************
@@ -2431,34 +2431,34 @@ BOOL DirEntry::MakeShortName( const String& rLongName, DirEntryKind eKind,
 |*
 *************************************************************************/
 
-BOOL DirEntry::MakeDir( BOOL bSloppy ) const
+sal_Bool DirEntry::MakeDir( sal_Bool bSloppy ) const
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
         // Schnellpruefung, ob vorhanden
         if ( FileStat( *this ).IsKind( FSYS_KIND_DIR ) )
-                return TRUE;
+                return sal_True;
         if ( bSloppy && pParent )
                  if ( FileStat( *pParent ).IsKind( FSYS_KIND_DIR ) )
-                          return TRUE;
+                          return sal_True;
 
         const DirEntry *pNewDir = bSloppy ? pParent : this;
         if ( pNewDir )
         {
                 // den Path zum Dir erzeugen
-                if ( pNewDir->pParent && !pNewDir->pParent->MakeDir(FALSE) )
-                        return FALSE;
+                if ( pNewDir->pParent && !pNewDir->pParent->MakeDir(sal_False) )
+                        return sal_False;
 
                 // das Dir selbst erzeugen
                 if ( pNewDir->eFlag == FSYS_FLAG_ABSROOT ||
                          pNewDir->eFlag == FSYS_FLAG_ABSROOT ||
                          pNewDir->eFlag == FSYS_FLAG_VOLUME )
-                        return TRUE;
+                        return sal_True;
                 else
                 {
                         //? nError = ???
                         if ( FileStat( *pNewDir ).IsKind( FSYS_KIND_DIR ) )
-                                return TRUE;
+                                return sal_True;
                         else
                         {
                                 FSysFailOnErrorImpl();
@@ -2472,7 +2472,7 @@ BOOL DirEntry::MakeDir( BOOL bSloppy ) const
 #ifdef WIN32
                                 SetLastError(0);
 #endif
-                                BOOL bResult = (0 == _mkdir( (char*) bDirName.GetBuffer() ));
+                                sal_Bool bResult = (0 == _mkdir( (char*) bDirName.GetBuffer() ));
                                 if ( !bResult )
                                 {
                                     // Wer hat diese Methode const gemacht ?
@@ -2487,7 +2487,7 @@ BOOL DirEntry::MakeDir( BOOL bSloppy ) const
                         }
                 }
         }
-        return TRUE;
+        return sal_True;
 }
 
 /*************************************************************************
@@ -2591,7 +2591,7 @@ FSysError DirEntry::MoveTo( const DirEntry& rNewName ) const
             // ja, also intra-device-move mit MoveFile
             MoveFile( bFrom.GetBuffer(), bTo.GetBuffer() );
             // MoveFile ist buggy bei cross-device operationen.
-            // Der R?ckgabewert ist auch dann TRUE, wenn nur ein Teil der Operation geklappt hat.
+            // Der R?ckgabewert ist auch dann sal_True, wenn nur ein Teil der Operation geklappt hat.
             // Zudem zeigt MoveFile unterschiedliches Verhalten bei unterschiedlichen NT-Versionen.
             return Sys2SolarError_Impl( GetLastError() );
         }
@@ -2709,10 +2709,10 @@ FSysError DirEntry::Kill(  FSysAction nActions ) const
         pName[bTmpName.Len()+1] = (char) 0;
 
         //read-only files sollen auch geloescht werden koennen
-        BOOL isReadOnly = FileStat::GetReadOnlyFlag(*this);
+        sal_Bool isReadOnly = FileStat::GetReadOnlyFlag(*this);
         if (isReadOnly)
         {
-            FileStat::SetReadOnlyFlag(*this, FALSE);
+            FileStat::SetReadOnlyFlag(*this, sal_False);
         }
 
         // directory?
@@ -2722,7 +2722,7 @@ FSysError DirEntry::Kill(  FSysAction nActions ) const
                 if ( FSYS_ACTION_RECURSIVE == (nActions & FSYS_ACTION_RECURSIVE) )
                 {
                         Dir aDir( *this, FSYS_KIND_DIR|FSYS_KIND_FILE );
-                        for ( USHORT n = 0; eError == FSYS_ERR_OK && n < aDir.Count(); ++n )
+                        for ( sal_uInt16 n = 0; eError == FSYS_ERR_OK && n < aDir.Count(); ++n )
                         {
                                 const DirEntry &rSubDir = aDir[n];
                                 DirEntryFlag flag = rSubDir.GetFlag();
@@ -2823,20 +2823,20 @@ FSysError DirEntry::Kill(  FSysAction nActions ) const
 |*
 *************************************************************************/
 
-BOOL DirEntry::Contains( const DirEntry &rSubEntry ) const
+sal_Bool DirEntry::Contains( const DirEntry &rSubEntry ) const
 {
     DBG_ASSERT( IsAbs() && rSubEntry.IsAbs(), "must be absolute entries" );
 
-        USHORT nThisLevel = Level();
-    USHORT nSubLevel = rSubEntry.Level();
+        sal_uInt16 nThisLevel = Level();
+    sal_uInt16 nSubLevel = rSubEntry.Level();
     if ( nThisLevel < nSubLevel )
     {
         for ( ; nThisLevel; --nThisLevel, --nSubLevel )
             if ( (*this)[nThisLevel-1] != rSubEntry[nSubLevel-1] )
-                return FALSE;
-        return TRUE;
+                return sal_False;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -2845,11 +2845,11 @@ BOOL DirEntry::Contains( const DirEntry &rSubEntry ) const
 |*
 *************************************************************************/
 
-USHORT DirEntry::Level() const
+sal_uInt16 DirEntry::Level() const
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
-    USHORT nLevel = 0;
+    sal_uInt16 nLevel = 0;
     const DirEntry *pRes = this;
     while ( pRes )
     {
@@ -2888,7 +2888,7 @@ String DirEntry::ConvertSystemToName( const String &rName )
 |*
 *************************************************************************/
 
-BOOL DirEntry::IsValid() const
+sal_Bool DirEntry::IsValid() const
 {
         return (nError == FSYS_ERR_OK);
 }
@@ -2899,9 +2899,9 @@ BOOL DirEntry::IsValid() const
 |*
 *************************************************************************/
 
-BOOL DirEntry::IsRFSAvailable()
+sal_Bool DirEntry::IsRFSAvailable()
 {
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -2914,18 +2914,18 @@ BOOL DirEntry::IsRFSAvailable()
 |*
 *************************************************************************/
 
-BOOL DirEntry::IsLongNameOnFAT() const
+sal_Bool DirEntry::IsLongNameOnFAT() const
 {
         // FAT-System?
         DirEntry aTempDirEntry(*this);
         aTempDirEntry.ToAbs();
         if (DirEntry::GetPathStyle(aTempDirEntry.GetDevice().GetName().GetChar(0)) != FSYS_STYLE_FAT)
         {
-            return FALSE;       // nein, also false
+            return sal_False;       // nein, also false
         }
 
         // DirEntry-Kette auf lange Dateinamen pr?fen
-        for( USHORT iLevel = this->Level(); iLevel > 0; iLevel-- )
+        for( sal_uInt16 iLevel = this->Level(); iLevel > 0; iLevel-- )
         {
             const DirEntry& rEntry = (const DirEntry&) (*this)[iLevel-1];
             String  aBase( rEntry.GetBase() );
@@ -2933,15 +2933,15 @@ BOOL DirEntry::IsLongNameOnFAT() const
 
             if (aBase.Len()>8)  // Name > 8?
             {
-                return TRUE;
+                return sal_True;
             }
 
             if (aExtension.Len()>3) // Extension > 3?
             {
-                return TRUE;
+                return sal_True;
             }
         }
-        return FALSE;
+        return sal_False;
 }
 
 //========================================================================