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

11 files changed, 192 insertions, 197 deletions

diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 4b13a12bb290..9308d0c727a8 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -113,7 +113,7 @@ protected:
     CfgStack aStack;
     CfgStackData *pStackData;
 
-    BOOL bLocalize;
+    sal_Bool bLocalize;
 
     virtual void WorkOnText(
         ByteString &rText,
@@ -133,7 +133,7 @@ private:
         const ByteString &rIsoLang,
         const ByteString &rResTyp );
 
-BOOL IsTokenClosed( const ByteString &rToken );
+sal_Bool IsTokenClosed( const ByteString &rToken );
 
 public:
     CfgParser();
@@ -194,7 +194,7 @@ private:
     ResData *pResData;
 
     ByteString sFilename;
-    BOOL bEnglish;
+    sal_Bool bEnglish;
 
 protected:
     void WorkOnText(
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 37524ac7fec6..999eac78ec0a 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -58,7 +58,7 @@
 
 
 struct eqstr{
-  BOOL operator()(const char* s1, const char* s2) const{
+  sal_Bool operator()(const char* s1, const char* s2) const{
     return strcmp(s1,s2)==0;
   }
 };
@@ -110,11 +110,11 @@ class ExportList
 {
 private:
     ExportListBase maList;
-    ULONG nSourceLanguageListEntryCount;
+    sal_uLong nSourceLanguageListEntryCount;
 
 public:
     ExportList() { nSourceLanguageListEntryCount = 0; }
-    ULONG GetSourceLanguageListEntryCount() { return nSourceLanguageListEntryCount; }
+    sal_uLong GetSourceLanguageListEntryCount() { return nSourceLanguageListEntryCount; }
     void NewSourceLanguageListEntry() { nSourceLanguageListEntryCount++; }
     size_t size() const { return maList.size(); }
     void push_back( ExportListEntry* item ) { maList.push_back( item ); }
@@ -147,21 +147,21 @@ class ResData
 {
 public:
     ~ResData();
-    BOOL SetId( const ByteString &rId, USHORT nLevel );
+    sal_Bool SetId( const ByteString &rId, sal_uInt16 nLevel );
 
-    USHORT nWidth;
-    USHORT nChildIndex;
-    USHORT nIdLevel;
-    BOOL bChild;
-    BOOL bChildWithText;
+    sal_uInt16 nWidth;
+    sal_uInt16 nChildIndex;
+    sal_uInt16 nIdLevel;
+    sal_Bool bChild;
+    sal_Bool bChildWithText;
 
-    BOOL bText;
-    BOOL bHelpText;
-    BOOL bQuickHelpText;
-    BOOL bTitle;
-    BOOL bList;
+    sal_Bool bText;
+    sal_Bool bHelpText;
+    sal_Bool bQuickHelpText;
+    sal_Bool bTitle;
+    sal_Bool bList;
 
-    BOOL bRestMerged;
+    sal_Bool bRestMerged;
 
     ByteString sResTyp;
     ByteString sId;
@@ -170,16 +170,16 @@ public:
     ByteString sFilename;
 
     ByteStringHashMap sText;
-    USHORT nTextRefId;
+    sal_uInt16 nTextRefId;
 
     ByteStringHashMap sHelpText;
-    USHORT nHelpTextRefId;
+    sal_uInt16 nHelpTextRefId;
 
     ByteStringHashMap sQuickHelpText;
-    USHORT nQuickHelpTextRefId;
+    sal_uInt16 nQuickHelpTextRefId;
 
     ByteStringHashMap sTitle;
-    USHORT nTitleRefId;
+    sal_uInt16 nTitleRefId;
 
     ByteString sTextTyp;
     ByteStringHashMap aFallbackData;
@@ -204,14 +204,14 @@ public:
             nWidth( 0 ),
             nChildIndex( 0 ),
             nIdLevel( ID_LEVEL_NULL ),
-            bChild( FALSE ),
-            bChildWithText( FALSE ),
-            bText( FALSE ),
-            bHelpText( FALSE ),
-            bQuickHelpText( FALSE ),
-            bTitle( FALSE ),
-            bList( FALSE ),
-            bRestMerged( FALSE ),
+            bChild( sal_False ),
+            bChildWithText( sal_False ),
+            bText( sal_False ),
+            bHelpText( sal_False ),
+            bQuickHelpText( sal_False ),
+            bTitle( sal_False ),
+            bList( sal_False ),
+            bRestMerged( sal_False ),
             sGId( rGId ),
             nTextRefId( REFID_NONE ),
             nHelpTextRefId( REFID_NONE ),
@@ -232,14 +232,14 @@ public:
             :
             nChildIndex( 0 ),
             nIdLevel( ID_LEVEL_NULL ),
-            bChild( FALSE ),
-            bChildWithText( FALSE ),
-            bText( FALSE ),
-            bHelpText( FALSE ),
-            bQuickHelpText( FALSE ),
-            bTitle( FALSE ),
-            bList( FALSE ),
-            bRestMerged( FALSE ),
+            bChild( sal_False ),
+            bChildWithText( sal_False ),
+            bText( sal_False ),
+            bHelpText( sal_False ),
+            bQuickHelpText( sal_False ),
+            bTitle( sal_False ),
+            bList( sal_False ),
+            bRestMerged( sal_False ),
             sGId( rGId ),
             sFilename( rFilename ),
             nTextRefId( REFID_NONE ),
@@ -303,23 +303,23 @@ private:
 
     ByteString sActPForm;               // hold cur. system
 
-    BOOL bDefine;                       // cur. res. in a define?
-    BOOL bNextMustBeDefineEOL;          // define but no \ at lineend
-    size_t nLevel;                      // res. recursiv? how deep?
-    USHORT nList;                       // cur. res. is String- or FilterList
+    sal_Bool bDefine;                       // cur. res. in a define?
+    sal_Bool bNextMustBeDefineEOL;          // define but no \ at lineend
+    sal_uLong nLevel;                       // res. recursiv? how deep?
+    sal_uInt16 nList;                       // cur. res. is String- or FilterList
     ByteString nListLang;
-    ULONG nListIndex;
-    ULONG nListLevel;
+    sal_uLong nListIndex;
+    sal_uLong nListLevel;
     bool bSkipFile;
     ByteString sProject;
     ByteString sRoot;
-    BOOL bEnableExport;
-    BOOL bMergeMode;
+    sal_Bool bEnableExport;
+    sal_Bool bMergeMode;
     ByteString sMergeSrc;
     ByteString sLastListLine;
-    BOOL bError;                        // any errors while export?
-    BOOL bReadOver;
-    BOOL bDontWriteOutput;
+    sal_Bool bError;                        // any errors while export?
+    sal_Bool bReadOver;
+    sal_Bool bDontWriteOutput;
     ByteString sLastTextTyp;
     static bool isInitialized;
     ByteString sFilename;
@@ -342,7 +342,7 @@ public:
     static bool hasUTF8ByteOrderMarker( const ByteString &rString );
     static void RemoveUTF8ByteOrderMarkerFromFile( const ByteString &rFilename );
     static bool fileHasUTF8ByteOrderMarker( const ByteString &rString );
-    static ByteString GetIsoLangByIndex( USHORT nIndex );
+    static ByteString GetIsoLangByIndex( sal_uInt16 nIndex );
     static void QuotHTML( ByteString &rString );
     static bool CopyFile( const ByteString& source , const ByteString& dest );
 
@@ -367,7 +367,7 @@ public:
     static void FillInFallbacks( ResData *pResData );
     static void FillInListFallbacks( ExportList *pList, const ByteString &nSource, const ByteString &nFallback );
     static ByteString GetTimeStamp();
-    static BOOL ConvertLineEnds( ByteString sSource, ByteString sDestination );
+    static sal_Bool ConvertLineEnds( ByteString sSource, ByteString sDestination );
     static ByteString GetNativeFile( ByteString sSource );
     static DirEntry GetTempFile();
 
@@ -378,11 +378,11 @@ private:
     static std::vector<ByteString> aLanguages;
     static std::vector<ByteString> aForcedLanguages;
 
-    BOOL ListExists( ResData *pResData, USHORT nLst );
+    sal_Bool ListExists( ResData *pResData, sal_uInt16 nLst );
 
-    BOOL WriteData( ResData *pResData, BOOL bCreateNew = FALSE );// called befor dest. cur ResData
-    BOOL WriteExportList( ResData *pResData, ExportList *pExportList,
-                        const ByteString &rTyp, BOOL bCreateNew = FALSE );
+    sal_Bool WriteData( ResData *pResData, sal_Bool bCreateNew = sal_False );// called befor dest. cur ResData
+    sal_Bool WriteExportList( ResData *pResData, ExportList *pExportList,
+                        const ByteString &rTyp, sal_Bool bCreateNew = sal_False );
 
     ByteString MergePairedList( ByteString& sLine , ByteString& sText );
 
@@ -399,10 +399,10 @@ private:
     void CleanValue( ByteString &rValue );
     ByteString GetText( const ByteString &rSource, int nToken );
 
-    BOOL PrepareTextToMerge( ByteString &rText, USHORT nTyp,
+    sal_Bool PrepareTextToMerge( ByteString &rText, sal_uInt16 nTyp,
         ByteString &nLangIndex, ResData *pResData );
 
-    void MergeRest( ResData *pResData, USHORT nMode = MERGE_MODE_NORMAL );
+    void MergeRest( ResData *pResData, sal_uInt16 nMode = MERGE_MODE_NORMAL );
     void ConvertMergeContent( ByteString &rText );
 
       void WriteToMerged( const ByteString &rText , bool bSDFContent );
@@ -411,17 +411,17 @@ private:
     void CutComment( ByteString &rText );
 
 public:
-    Export( const ByteString &rOutput, BOOL bWrite,
+    Export( const ByteString &rOutput, sal_Bool bWrite,
             const ByteString &rPrj, const ByteString &rPrjRoot , const ByteString& rFile );
-    Export( const ByteString &rOutput, BOOL bWrite,
+    Export( const ByteString &rOutput, sal_Bool bWrite,
             const ByteString &rPrj, const ByteString &rPrjRoot,
             const ByteString &rMergeSource , const ByteString& rFile );
     ~Export();
 
     void Init();
     int Execute( int nToken, const char * pToken ); // called from lexer
-    void SetError() { bError = TRUE; }
-    BOOL GetError() { return bError; }
+    void SetError() { bError = sal_True; }
+    sal_Bool GetError() { return bError; }
 };
 
 
@@ -463,8 +463,8 @@ public:
             sTitle[ nId ] = rTitle;
             bTitleFirst[ nId ] = true;
         }
-     BOOL GetText( ByteString &rReturn, USHORT nTyp, const ByteString &nLangIndex, BOOL bDel = FALSE );
-     BOOL GetTransex3Text( ByteString &rReturn, USHORT nTyp, const ByteString &nLangIndex, BOOL bDel = FALSE );
+     sal_Bool GetText( ByteString &rReturn, sal_uInt16 nTyp, const ByteString &nLangIndex, sal_Bool bDel = sal_False );
+     sal_Bool GetTransex3Text( ByteString &rReturn, sal_uInt16 nTyp, const ByteString &nLangIndex, sal_Bool bDel = sal_False );
 
 };
 
@@ -498,7 +498,7 @@ public:
     PFormEntrys* GetPFObject( const ByteString& rPFO );
 
     ByteString Dump();
-    BOOL operator==( ResData *pData );
+    sal_Bool operator==( ResData *pData );
 };
 
 //
@@ -511,39 +511,34 @@ public:
 
 class MergeDataFile
 {
-private:
-    BOOL bErrorLog;
-    ByteString sErrorLog;
-    SvFileStream aErrLog;
-    ByteStringSet aLanguageSet;
+    private:
+        sal_Bool bErrorLog;
+        ByteString sErrorLog;
+        SvFileStream aErrLog;
     MergeDataHashMap aMap;
-    ByteStringHashMap aLanguageMap;
-    std::vector<ByteString> aLanguageList;
-    ByteStringHashMap aFilenames;
-
+        std::set<ByteString> aLanguageSet;
 
-public:
-    MergeDataFile( const ByteString &rFileName, const ByteString& rFile , BOOL bErrLog, CharSet aCharSet, bool bCaseSensitive = false );
-    ~MergeDataFile();
+        MergeData *GetMergeData( ResData *pResData , bool bCaseSensitve = false );
+        void InsertEntry( const ByteString &rTYP, const ByteString &rGID, const ByteString &rLID,
+            const ByteString &rPFO,
+            const ByteString &nLang, const ByteString &rTEXT,
+            const ByteString &rQHTEXT, const ByteString &rTITLE,
+            const ByteString &sFilename, bool bCaseSensitive
+            );
+        ByteString Dump();
+        void WriteError( const ByteString &rLine );
 
+    public:
+        MergeDataFile( const ByteString &rFileName, const ByteString& rFile , sal_Bool bErrLog, CharSet aCharSet, bool bCaseSensitive = false );
+        ~MergeDataFile();
 
-    std::vector<ByteString> GetLanguages();
-    MergeData *GetMergeData( ResData *pResData , bool bCaseSensitve = false );
 
-    PFormEntrys *GetPFormEntrys( ResData *pResData );
-    PFormEntrys *GetPFormEntrysCaseSensitive( ResData *pResData );
+        std::vector<ByteString> GetLanguages();
 
-    void InsertEntry( const ByteString &rTYP, const ByteString &rGID, const ByteString &rLID,
-                const ByteString &rPFO,
-                const ByteString &nLang , const ByteString &rTEXT,
-                const ByteString &rQHTEXT, const ByteString &rTITLE ,
-                const ByteString &sFilename , bool bCaseSensitive
-                );
-    static USHORT GetLangIndex( USHORT nId );
-    static ByteString CreateKey( const ByteString& rTYP , const ByteString& rGID , const ByteString& rLID , const ByteString& rFilename , bool bCaseSensitive = false );
+        PFormEntrys *GetPFormEntrys( ResData *pResData );
+        PFormEntrys *GetPFormEntrysCaseSensitive( ResData *pResData );
 
-    ByteString Dump();
-    void WriteError( const ByteString &rLine );
+        static ByteString CreateKey( const ByteString& rTYP , const ByteString& rGID , const ByteString& rLID , const ByteString& rFilename , bool bCaseSensitive = false );
 };
 
 
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index 660ddadd303a..971f85016fbd 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -43,7 +43,7 @@ private:
 
     ParserMessageList aMessages;
     LineFormat aFormat;
-    ULONG nLineNumber;
+    sal_uLong nLineNumber;
 
     ByteString aUniqId;
     ByteString aLineType;
@@ -52,15 +52,15 @@ private:
     ByteString aQuickHelpText;
     ByteString aTitle;
 
-    BOOL bOK;
-    BOOL bFixed;
+    sal_Bool bOK;
+    sal_Bool bFixed;
 
     void              ReassembleLine();
 
 public:
-    GSILine( const ByteString &rLine, ULONG nLine );
+    GSILine( const ByteString &rLine, sal_uLong nLine );
     LineFormat  GetLineFormat() const    { return aFormat; }
-    ULONG       GetLineNumber() const    { return nLineNumber; }
+    sal_uLong       GetLineNumber() const    { return nLineNumber; }
 
     ByteString  const GetUniqId()     const    { return aUniqId; }
     ByteString  const GetLineType()   const    { return aLineType; }
@@ -76,13 +76,13 @@ public:
           void        SetTitle( ByteString &aNew ) { aTitle = aNew; ReassembleLine(); }
 
     ParserMessageList* GetMessageList() { return &aMessages; };
-    BOOL HasMessages(){ return ( !aMessages.empty() ); };
+    sal_Bool HasMessages(){ return ( aMessages.size() > 0 ); };
 
-    BOOL IsOK() const { return bOK; }
+    sal_Bool IsOK() const { return bOK; }
     void NotOK();
 
-    BOOL IsFixed() const { return bFixed; }
-    void SetFixed() { bFixed = TRUE; };
+    sal_Bool IsFixed() const { return bFixed; }
+    void SetFixed() { bFixed = sal_True; };
 };
 
 //
@@ -100,31 +100,31 @@ private:
     GSILine *pSourceLine;
     GSILine *pReferenceLine;
     void PrintList( ParserMessageList *pList, ByteString aPrefix, GSILine *pLine );
-    BOOL bPrintContext;
-    BOOL bCheckSourceLang;
-    BOOL bCheckTranslationLang;
-    BOOL bReference;
-    BOOL bAllowKeyIDs;
-    BOOL bAllowSuspicious;
+    sal_Bool bPrintContext;
+    sal_Bool bCheckSourceLang;
+    sal_Bool bCheckTranslationLang;
+    sal_Bool bReference;
+    sal_Bool bAllowKeyIDs;
+    sal_Bool bAllowSuspicious;
 
-    BOOL bHasBlockError;
+    sal_Bool bHasBlockError;
 
-    BOOL IsUTF8( const ByteString &aTestee, BOOL bFixTags, USHORT &nErrorPos, ByteString &aErrorMsg, BOOL &bHasBeenFixed, ByteString &aFixed ) const;
-    BOOL TestUTF8( GSILine* pTestee, BOOL bFixTags );
-    BOOL HasSuspiciousChars( GSILine* pTestee, GSILine* pSource );
+    sal_Bool IsUTF8( const ByteString &aTestee, sal_Bool bFixTags, sal_uInt16 &nErrorPos, ByteString &aErrorMsg, sal_Bool &bHasBeenFixed, ByteString &aFixed ) const;
+    sal_Bool TestUTF8( GSILine* pTestee, sal_Bool bFixTags );
+    sal_Bool HasSuspiciousChars( GSILine* pTestee, GSILine* pSource );
 
 public:
-    GSIBlock( BOOL PbPrintContext, BOOL bSource, BOOL bTrans, BOOL bRef, BOOL bAllowKID, BOOL bAllowSusp );
+    GSIBlock( sal_Bool PbPrintContext, sal_Bool bSource, sal_Bool bTrans, sal_Bool bRef, sal_Bool bAllowKID, sal_Bool bAllowSusp );
     ~GSIBlock();
-    void PrintMessage( ByteString aType, ByteString aMsg, ByteString aPrefix, ByteString aContext, ULONG nLine, ByteString aUniqueId = ByteString() );
-    void PrintError( ByteString aMsg, ByteString aPrefix, ByteString aContext, ULONG nLine, ByteString aUniqueId = ByteString() );
+    void PrintMessage( ByteString aType, ByteString aMsg, ByteString aPrefix, ByteString aContext, sal_uLong nLine, ByteString aUniqueId = ByteString() );
+    void PrintError( ByteString aMsg, ByteString aPrefix, ByteString aContext, sal_uLong nLine, ByteString aUniqueId = ByteString() );
     void InsertLine( GSILine* pLine, const ByteString aSourceLang);
     void SetReferenceLine( GSILine* pLine );
-    BOOL CheckSyntax( ULONG nLine, BOOL bRequireSourceLine, BOOL bFixTags );
+    sal_Bool CheckSyntax( sal_uLong nLine, sal_Bool bRequireSourceLine, sal_Bool bFixTags );
 
-    void WriteError( LazySvFileStream &aErrOut, BOOL bRequireSourceLine );
-    void WriteCorrect( LazySvFileStream &aOkOut, BOOL bRequireSourceLine );
-    void WriteFixed( LazySvFileStream &aFixOut, BOOL bRequireSourceLine );
+    void WriteError( LazySvFileStream &aErrOut, sal_Bool bRequireSourceLine );
+    void WriteCorrect( LazySvFileStream &aOkOut, sal_Bool bRequireSourceLine );
+    void WriteFixed( LazySvFileStream &aFixOut, sal_Bool bRequireSourceLine );
 };
 
 #endif
diff --git a/l10ntools/inc/l10ntools/vosapp.hxx b/l10ntools/inc/l10ntools/vosapp.hxx
index e45840b4f9df..e8e97fb71fef 100644
--- a/l10ntools/inc/l10ntools/vosapp.hxx
+++ b/l10ntools/inc/l10ntools/vosapp.hxx
@@ -10,18 +10,18 @@
 class Application
 {
 public:
-    USHORT GetCommandLineParamCount();
-    XubString GetCommandLineParam( USHORT nParam );
+    sal_uInt16 GetCommandLineParamCount();
+    XubString GetCommandLineParam( sal_uInt16 nParam );
     virtual void Main() = 0;
 };
 
 // Urg: Cut & Paste from svapp.cxx: we don't want to depend on vcl
-USHORT Application::GetCommandLineParamCount()
+sal_uInt16 Application::GetCommandLineParamCount()
 {
     return osl_getCommandArgCount();
 }
 
-XubString Application::GetCommandLineParam( USHORT nParam )
+XubString Application::GetCommandLineParam( sal_uInt16 nParam )
 {
     rtl::OUString aParam;
     osl_getCommandArg( nParam, &aParam.pData );
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 7dbe884bb868..8aaf98d3d782 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -45,11 +45,11 @@ typedef ::std::vector< ByteString* > LngLineList;
 class LngParser
 {
 private:
-    USHORT nError;
+    sal_uInt16 nError;
     LngLineList *pLines;
     ByteString sSource;
-    BOOL bDBIsUTF8;
-    BOOL bULF;
+    sal_Bool bDBIsUTF8;
+    sal_Bool bULF;
     bool bQuiet;
     std::vector<ByteString> aLanguages;
 
@@ -60,11 +60,11 @@ private:
                     const ByteString &rPrj ,
                     const ByteString &rRoot , const ByteString &sActFileName , const ByteString &sID );
 public:
-    LngParser( const ByteString &rLngFile, BOOL bUTF8, BOOL bULFFormat );
+    LngParser( const ByteString &rLngFile, sal_Bool bUTF8, sal_Bool bULFFormat );
     ~LngParser();
 
-    BOOL CreateSDF( const ByteString &rSDFFile, const ByteString &rPrj, const ByteString &rRoot );
-    BOOL Merge( const ByteString &rSDFFile, const ByteString &rDestinationFile , const ByteString &rPrj );
+    sal_Bool CreateSDF( const ByteString &rSDFFile, const ByteString &rPrj, const ByteString &rRoot );
+    sal_Bool Merge( const ByteString &rSDFFile, const ByteString &rDestinationFile , const ByteString &rPrj );
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/srciter.hxx b/l10ntools/inc/srciter.hxx
index 6583381359a4..c859d2356c1a 100644
--- a/l10ntools/inc/srciter.hxx
+++ b/l10ntools/inc/srciter.hxx
@@ -50,7 +50,7 @@ public:
     SourceTreeIterator( const ByteString &rRootDirectory, const ByteString &rVersion , bool bLocal_in = false);
     virtual ~SourceTreeIterator();
 
-    BOOL StartExecute();
+    sal_Bool StartExecute();
     void EndExecute();
 
     virtual void OnExecuteDirectory( const rtl::OUString &rDirectory );
diff --git a/l10ntools/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx
index f905ec627d72..1a41f508533f 100644
--- a/l10ntools/inc/tagtest.hxx
+++ b/l10ntools/inc/tagtest.hxx
@@ -35,9 +35,9 @@
 
 class GSILine;
 
-typedef USHORT TokenId;
+typedef sal_uInt16 TokenId;
 
-#define TOK_INVALIDPOS  USHORT( 0xFFFF )
+#define TOK_INVALIDPOS  sal_uInt16( 0xFFFF )
 
 class ParserMessage;
 typedef ::std::vector< ParserMessage* > Impl_ParserMessageList;
@@ -71,24 +71,24 @@ private:
 
     String aTagName;
     StringHashMap aProperties;
-    BOOL bClosed;    // tag is closed  <sdnf/>
-    BOOL bCloseTag;  // tag is close Tag  </sdnf>
+    sal_Bool bClosed;    // tag is closed  <sdnf/>
+    sal_Bool bCloseTag;  // tag is close Tag  </sdnf>
 
 
-    BOOL bIsBroken;
-    BOOL bHasBeenFixed;
-    BOOL bDone;
+    sal_Bool bIsBroken;
+    sal_Bool bHasBeenFixed;
+    sal_Bool bDone;
 
 public:
 
     String aTokenString;
     TokenId nId;
-    USHORT nPos;            // Position in String
+    sal_uInt16 nPos;            // Position in String
 
-    TokenInfo():bClosed(FALSE),bCloseTag(FALSE),bIsBroken(FALSE),bHasBeenFixed(FALSE),bDone(FALSE),nId( 0 ){;}
-explicit    TokenInfo( TokenId pnId, USHORT nP ):bClosed(FALSE),bCloseTag(FALSE),bIsBroken(FALSE),bHasBeenFixed(FALSE),bDone(FALSE),nId( pnId ),nPos(nP){;}
-explicit    TokenInfo( TokenId pnId, USHORT nP, String paStr ):bClosed(FALSE),bCloseTag(FALSE),bIsBroken(FALSE),bHasBeenFixed(FALSE),bDone(FALSE),aTokenString( paStr ),nId( pnId ),nPos(nP) {;}
-explicit    TokenInfo( TokenId pnId, USHORT nP, String paStr, ParserMessageList &rErrorList );
+    TokenInfo():bClosed(sal_False),bCloseTag(sal_False),bIsBroken(sal_False),bHasBeenFixed(sal_False),bDone(sal_False),nId( 0 ){;}
+explicit    TokenInfo( TokenId pnId, sal_uInt16 nP ):bClosed(sal_False),bCloseTag(sal_False),bIsBroken(sal_False),bHasBeenFixed(sal_False),bDone(sal_False),nId( pnId ),nPos(nP){;}
+explicit    TokenInfo( TokenId pnId, sal_uInt16 nP, String paStr ):bClosed(sal_False),bCloseTag(sal_False),bIsBroken(sal_False),bHasBeenFixed(sal_False),bDone(sal_False),aTokenString( paStr ),nId( pnId ),nPos(nP) {;}
+explicit    TokenInfo( TokenId pnId, sal_uInt16 nP, String paStr, ParserMessageList &rErrorList );
 
     String GetTagName() const;
 
@@ -97,25 +97,25 @@ explicit    TokenInfo( TokenId pnId, USHORT nP, String paStr, ParserMessageList
     /**
         Is the property to be ignored or does it have the default value anyways
     **/
-    BOOL IsPropertyRelevant( const ByteString &aName, const String &aValue ) const;
-    BOOL IsPropertyValueValid( const ByteString &aName, const String &aValue ) const;
+    sal_Bool IsPropertyRelevant( const ByteString &aName, const String &aValue ) const;
+    sal_Bool IsPropertyValueValid( const ByteString &aName, const String &aValue ) const;
     /**
         Does the property contain the same value for all languages
         e.g.: the href in a link tag
     **/
-    BOOL IsPropertyInvariant( const ByteString &aName, const String &aValue ) const;
+    sal_Bool IsPropertyInvariant( const ByteString &aName, const String &aValue ) const;
     /**
         a subset of IsPropertyInvariant but containing only those that are fixable
         we dont wat to fix e.g.: ahelp :: visibility
     **/
-    BOOL IsPropertyFixable( const ByteString &aName ) const;
-    BOOL MatchesTranslation( TokenInfo& rInfo, BOOL bGenErrors, ParserMessageList &rErrorList, BOOL bFixTags = FALSE ) const;
+    sal_Bool IsPropertyFixable( const ByteString &aName ) const;
+    sal_Bool MatchesTranslation( TokenInfo& rInfo, sal_Bool bGenErrors, ParserMessageList &rErrorList, sal_Bool bFixTags = sal_False ) const;
 
-    BOOL IsDone() const { return bDone; }
-    void SetDone( BOOL bNew = TRUE ) { bDone = bNew; }
+    sal_Bool IsDone() const { return bDone; }
+    void SetDone( sal_Bool bNew = sal_True ) { bDone = bNew; }
 
-    BOOL HasBeenFixed() const { return bHasBeenFixed; }
-    void SetHasBeenFixed( BOOL bNew = TRUE ) { bHasBeenFixed = bNew; }
+    sal_Bool HasBeenFixed() const { return bHasBeenFixed; }
+    void SetHasBeenFixed( sal_Bool bNew = sal_True ) { bHasBeenFixed = bNew; }
 };
 
 
@@ -126,10 +126,10 @@ private:
 
 public:
     ~ParserMessageList() { clear(); }
-    void AddError( USHORT nErrorNr, ByteString aErrorText, const TokenInfo &rTag );
-    void AddWarning( USHORT nErrorNr, ByteString aErrorText, const TokenInfo &rTag );
+    void AddError( sal_uInt16 nErrorNr, ByteString aErrorText, const TokenInfo &rTag );
+    void AddWarning( sal_uInt16 nErrorNr, ByteString aErrorText, const TokenInfo &rTag );
 
-    BOOL HasErrors();
+    sal_Bool HasErrors();
     bool empty() const { return maList.empty(); }
     size_t size() const { return maList.size(); }
     ParserMessage* operator [] ( size_t i ) { return ( i < maList.size() ) ? maList[ i ] : NULL; }
@@ -261,54 +261,54 @@ public:
 
 class ParserMessage
 {
-    USHORT nErrorNr;
+    sal_uInt16 nErrorNr;
     ByteString aErrorText;
-    USHORT nTagBegin,nTagLength;
+    sal_uInt16 nTagBegin,nTagLength;
 
 protected:
-    ParserMessage( USHORT PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag );
+    ParserMessage( sal_uInt16 PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag );
 public:
 
-    USHORT GetErrorNr() { return nErrorNr; }
+    sal_uInt16 GetErrorNr() { return nErrorNr; }
     ByteString GetErrorText() { return aErrorText; }
 
-    USHORT GetTagBegin() { return nTagBegin; }
-    USHORT GetTagLength() { return nTagLength; }
+    sal_uInt16 GetTagBegin() { return nTagBegin; }
+    sal_uInt16 GetTagLength() { return nTagLength; }
 
     virtual ~ParserMessage() {}
-    virtual BOOL IsError() =0;
+    virtual sal_Bool IsError() =0;
     virtual ByteString Prefix() =0;
 };
 
 class ParserError : public ParserMessage
 {
 public:
-    ParserError( USHORT PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag );
+    ParserError( sal_uInt16 PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag );
 
-    virtual BOOL IsError() {return TRUE;};
+    virtual sal_Bool IsError() {return sal_True;};
     virtual ByteString Prefix() {return "Error:"; };
 };
 
 class ParserWarning : public ParserMessage
 {
 public:
-    ParserWarning( USHORT PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag );
+    ParserWarning( sal_uInt16 PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag );
 
-    virtual BOOL IsError() {return FALSE;};
+    virtual sal_Bool IsError() {return sal_False;};
     virtual ByteString Prefix() {return "Warning:"; };
 };
 
 class SimpleParser
 {
 private:
-    USHORT nPos;
+    sal_uInt16 nPos;
     String aSource;
     String aLastToken;
     TokenList aTokenList;
 
     TokenInfo aNextTag;     // to store closetag in case of combined tags like <br/>
 
-    String GetNextTokenString( ParserMessageList &rErrorList, USHORT &rTokeStartPos );
+    String GetNextTokenString( ParserMessageList &rErrorList, sal_uInt16 &rTokeStartPos );
 
 public:
     SimpleParser();
@@ -320,9 +320,9 @@ public:
 
 class TokenParser
 {
-    BOOL match( const TokenInfo &aCurrentToken, const TokenId &aExpectedToken );
-    BOOL match( const TokenInfo &aCurrentToken, const TokenInfo &aExpectedToken );
-    void ParseError( USHORT nErrNr, ByteString aErrMsg, const TokenInfo &rTag );
+    sal_Bool match( const TokenInfo &aCurrentToken, const TokenId &aExpectedToken );
+    sal_Bool match( const TokenInfo &aCurrentToken, const TokenInfo &aExpectedToken );
+    void ParseError( sal_uInt16 nErrNr, ByteString aErrMsg, const TokenInfo &rTag );
     void Paragraph();
     void PfCase();
     void PfCaseBegin();
@@ -338,7 +338,7 @@ class TokenParser
 
     TokenId nPfCaseOptions;
     TokenId nAppCaseOptions;
-    BOOL bPfCaseActive ,bAppCaseActive;
+    sal_Bool bPfCaseActive ,bAppCaseActive;
 
     TokenId nActiveRefTypes;
 
@@ -356,15 +356,15 @@ private:
     TokenParser aReferenceParser;
     TokenParser aTesteeParser;
     ParserMessageList aCompareWarningList;
-    void CheckTags( TokenList &aReference, TokenList &aTestee, BOOL bFixTags );
-    BOOL IsTagMandatory( TokenInfo const &aToken, TokenId &aMetaTokens );
+    void CheckTags( TokenList &aReference, TokenList &aTestee, sal_Bool bFixTags );
+    sal_Bool IsTagMandatory( TokenInfo const &aToken, TokenId &aMetaTokens );
     String aFixedTestee;
 public:
     void CheckReference( GSILine *aReference );
-    void CheckTestee( GSILine *aTestee, BOOL bHasSourceLine, BOOL bFixTags );
+    void CheckTestee( GSILine *aTestee, sal_Bool bHasSourceLine, sal_Bool bFixTags );
 
     ParserMessageList& GetCompareWarnings(){ return aCompareWarningList; }
-    BOOL HasCompareWarnings(){ return ( !aCompareWarningList.empty() ); }
+    sal_Bool HasCompareWarnings(){ return ( !aCompareWarningList.empty() ); }
 
     String GetFixedTestee(){ return aFixedTestee; }
 };
diff --git a/l10ntools/inc/wtranode.hxx b/l10ntools/inc/wtranode.hxx
index 6283f4ea0c93..b2c10e07d2d2 100644
--- a/l10ntools/inc/wtranode.hxx
+++ b/l10ntools/inc/wtranode.hxx
@@ -81,7 +81,7 @@ class WTT_Node  // WordTransTree-Node
     // INQUIRY
     E_TokenType         TokenType() const;
     UINT8               Value() const;
-    BOOL                IsOnDeleting() const;
+    sal_Bool                IsOnDeleting() const;
     const ByteString &  ReplaceString() const;
 
   private:
@@ -103,7 +103,7 @@ WTT_Node::TokenType() const
 inline UINT8
 WTT_Node::Value() const
     { return nValue; }
-inline BOOL
+inline sal_Bool
 WTT_Node::IsOnDeleting() const
     { return bIsOnDeleting; }
 inline const ByteString &
diff --git a/l10ntools/inc/wtratree.hxx b/l10ntools/inc/wtratree.hxx
index a658d27fd1ee..c06be49b183c 100644
--- a/l10ntools/inc/wtratree.hxx
+++ b/l10ntools/inc/wtratree.hxx
@@ -82,7 +82,7 @@ class WordTransTree
     E_Result            TransformNextToken();
 
     // INQUIRY
-    BOOL                TextEndReached() const;
+    sal_Bool                TextEndReached() const;
     const char *        Output() const;
 
         // These 3 functions are valid between two calls of
@@ -133,7 +133,7 @@ class WordTransTree
 
 
 
-inline BOOL
+inline sal_Bool
 WordTransTree::TextEndReached() const
     { return pInputPosition == pInputEnd; }
 inline const char *
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 5a25b3d65959..9f67e7343633 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -86,7 +86,7 @@ public:
     void setValue(const String &rValue){sValue=rValue;}
 
     /// returns true if two attributes are equal and have the same value
-    BOOL IsEqual(
+    sal_Bool IsEqual(
         const XMLAttribute &rAttribute  // the attribute which has to be equal
     )
     {
@@ -106,7 +106,7 @@ protected:
     XMLNode() {}
 
 public:
-    virtual USHORT GetNodeType() = 0;
+    virtual sal_uInt16 GetNodeType() = 0;
     virtual ~XMLNode() {}
 };
 
@@ -125,7 +125,7 @@ protected:
     XMLChildNode( const XMLChildNode& obj);
     XMLChildNode& operator=(const XMLChildNode& obj);
 public:
-    virtual USHORT GetNodeType() = 0;
+    virtual sal_uInt16 GetNodeType() = 0;
 
     /// returns the parent of this node
     XMLParentNode *GetParent() { return pParent; }
@@ -161,7 +161,7 @@ protected:
 
 
 public:
-    virtual USHORT GetNodeType() = 0;
+    virtual sal_uInt16 GetNodeType() = 0;
 
     /// returns child list of this node
     XMLChildNodeList *GetChildList() { return pChildList; }
@@ -198,7 +198,7 @@ typedef boost::unordered_map<ByteString , LangHashMap* ,
 typedef boost::unordered_map<ByteString, int, hashByteString,equalByteString>   HashMap;
 
 /// Mapping XML tag names <-> have localizable strings
-typedef boost::unordered_map<ByteString , BOOL ,
+typedef boost::unordered_map<ByteString , sal_Bool ,
                       hashByteString,equalByteString>                   TagMap;
 
 /** Holds information of a XML file, is root node of tree
@@ -216,7 +216,7 @@ public:
     ~XMLFile();
 
     ByteString* GetGroupID(std::deque<ByteString> &groupid);
-    void        Print( XMLNode *pCur = NULL, USHORT nLevel = 0 );
+    void        Print( XMLNode *pCur = NULL, sal_uInt16 nLevel = 0 );
     virtual void SearchL10NElements( XMLParentNode *pCur, int pos = 0 );
     void        Extract( XMLFile *pCur = NULL );
     void        View();
@@ -224,14 +224,14 @@ public:
     void        showType(XMLParentNode* node);
 
     XMLHashMap* GetStrings(){return XMLStrings;}
-    BOOL        Write( ByteString &rFilename );
-    BOOL        Write( ofstream &rStream , XMLNode *pCur = NULL );
+    sal_Bool        Write( ByteString &rFilename );
+    sal_Bool        Write( ofstream &rStream , XMLNode *pCur = NULL );
 
     bool        CheckExportStatus( XMLParentNode *pCur = NULL );// , int pos = 0 );
 
     XMLFile&    operator=(const XMLFile& obj);
 
-    virtual USHORT  GetNodeType();
+    virtual sal_uInt16  GetNodeType();
 
     /// returns file name
     const String &GetName() { return sFileName; }
@@ -272,10 +272,10 @@ public:
     static void         UnQuotHTML  ( String &rString );
 
     /// Return the numeric iso language code
-    //USHORT                GetLangByIsoLang( const ByteString &rIsoLang );
+    //sal_uInt16                GetLangByIsoLang( const ByteString &rIsoLang );
 
     /// Return the alpha strings representation
-    ByteString          GetIsoLangByIndex( USHORT nIndex );
+    ByteString          GetIsoLangByIndex( sal_uInt16 nIndex );
 
     static XMLUtil&     Instance();
     ~XMLUtil();
@@ -341,7 +341,7 @@ public:
 
     XMLElement& operator=(const XMLElement& obj);
     /// returns node type XML_NODE_ELEMENT
-    virtual USHORT GetNodeType();
+    virtual sal_uInt16 GetNodeType();
 
     /// returns element name
     const String &GetName() { return sElementName; }
@@ -411,7 +411,7 @@ public:
     XMLData(const XMLData& obj);
 
     XMLData& operator=(const XMLData& obj);
-    virtual USHORT GetNodeType();
+    virtual sal_uInt16 GetNodeType();
 
     /// returns the data
     const String &GetData() { return sData; }
@@ -443,7 +443,7 @@ public:
     )
                 : XMLChildNode( Parent ), sComment( rComment ) {}
 
-    virtual USHORT GetNodeType();
+    virtual sal_uInt16 GetNodeType();
 
     XMLComment( const XMLComment& obj );
 
@@ -475,7 +475,7 @@ public:
     XMLDefault& operator=(const XMLDefault& obj);
 
     /// returns node type XML_NODE_TYPE_COMMENT
-    virtual USHORT GetNodeType();
+    virtual sal_uInt16 GetNodeType();
 
     /// returns the comment
     const String &GetDefault()  { return sDefault; }
@@ -487,8 +487,8 @@ public:
  */
 struct XMLError {
     XML_Error eCode;    // the error code
-    ULONG nLine;        // error line number
-    ULONG nColumn;      // error column number
+    sal_uLong nLine;        // error line number
+    sal_uLong nColumn;      // error column number
     String sMessage;    // readable error message
 };
 
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index 7be4d5dc70d0..f0b213a54ce3 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -39,8 +39,8 @@ private:
     ByteString sGID;
     ByteString sLID;
 
-    BOOL bError;
-    BOOL bText;
+    sal_Bool bError;
+    sal_Bool bText;
 
     bool sLocalized;
 
@@ -75,8 +75,8 @@ public:
 
     int Execute( int nToken, char * pToken );
 
-    void SetError( BOOL bErr = TRUE ) { bError = bErr; }
-    BOOL GetError() { return bError; }
+    void SetError( sal_Bool bErr = sal_True ) { bError = bErr; }
+    sal_Bool GetError() { return bError; }
 };
 
 //