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

19 files changed, 265 insertions, 265 deletions

diff --git a/unotools/inc/unotools/accelcfg.hxx b/unotools/inc/unotools/accelcfg.hxx
index 92ad6a0faaf5..9bc3f2178e34 100644
--- a/unotools/inc/unotools/accelcfg.hxx
+++ b/unotools/inc/unotools/accelcfg.hxx
@@ -79,7 +79,7 @@ public:
     void            SetCommand( const SvtAcceleratorConfigItem& rItem );
 
                     // sets several or all configuration items
-                    // if bClear=FALSE, all items not in the sequence remain unchanged
+                    // if bClear=sal_False, all items not in the sequence remain unchanged
     void            SetItems( const SvtAcceleratorItemList& rItems, bool bClear );
 };
 
diff --git a/unotools/inc/unotools/componentresmodule.hxx b/unotools/inc/unotools/componentresmodule.hxx
index 3f0924c5586a..5fa704951ac0 100644
--- a/unotools/inc/unotools/componentresmodule.hxx
+++ b/unotools/inc/unotools/componentresmodule.hxx
@@ -81,7 +81,7 @@ namespace utl
     class UNOTOOLS_DLLPUBLIC ModuleRes : public ::ResId
     {
     public:
-        ModuleRes( USHORT _nId, OComponentResourceModule& _rModule ) : ResId( _nId, *_rModule.getResManager() ) { }
+        ModuleRes( sal_uInt16 _nId, OComponentResourceModule& _rModule ) : ResId( _nId, *_rModule.getResManager() ) { }
     };
 
     //====================================================================
@@ -120,7 +120,7 @@ namespace utl
         typedef ::utl::ModuleRes    BaseClass; \
     \
     public: \
-        ResClass( USHORT _nId ) : BaseClass( _nId, ModuleClass::getInstance() ) \
+        ResClass( sal_uInt16 _nId ) : BaseClass( _nId, ModuleClass::getInstance() ) \
         { \
         } \
     }; \
diff --git a/unotools/inc/unotools/configvaluecontainer.hxx b/unotools/inc/unotools/configvaluecontainer.hxx
index fc7f1d732f63..ed336373f703 100644
--- a/unotools/inc/unotools/configvaluecontainer.hxx
+++ b/unotools/inc/unotools/configvaluecontainer.hxx
@@ -188,7 +188,7 @@ namespace utl
             <p>The current values in memory (your exchange locations registered using the registerXXX methods) is
             forwarded to their respective configuration nodes.</p>
 
-            <p>Note that calling <method>write</method>(<TRUE/) is the same as calling <method>commit</method>(<TRUE/>).</p>
+            <p>Note that calling <method>write</method>(<sal_True/) is the same as calling <method>commit</method>(<TRUE/>).</p>
 
             @precond
                 The access must have been created for update access
@@ -204,7 +204,7 @@ namespace utl
 
         /** commits any changes done
 
-            <p>Note that calling <method>write</method>(<TRUE/) is the same as calling <method>commit</method>(<TRUE/>).</p>
+            <p>Note that calling <method>write</method>(<sal_True/) is the same as calling <method>commit</method>(<TRUE/>).</p>
 
             @precond
                 The access must have been created for update access
diff --git a/unotools/inc/unotools/defaultoptions.hxx b/unotools/inc/unotools/defaultoptions.hxx
index 1e7d04125aa4..ee6b005f05df 100644
--- a/unotools/inc/unotools/defaultoptions.hxx
+++ b/unotools/inc/unotools/defaultoptions.hxx
@@ -48,7 +48,7 @@ public:
     SvtDefaultOptions();
     virtual ~SvtDefaultOptions();
 
-    String  GetDefaultPath( USHORT nId ) const;
+    String  GetDefaultPath( sal_uInt16 nId ) const;
 };
 
 #endif // #ifndef INCLUDED_unotools_DEFAULTOPTIONS_HXX
diff --git a/unotools/inc/unotools/fontcfg.hxx b/unotools/inc/unotools/fontcfg.hxx
index 5ba0c65552ed..d370350484c1 100644
--- a/unotools/inc/unotools/fontcfg.hxx
+++ b/unotools/inc/unotools/fontcfg.hxx
@@ -119,38 +119,38 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration
 // IMPL_FONT_ATTR_COMIC         - Like Comic Sans MS
 // IMPL_FONT_ATTR_BRUSHSCRIPT   - More Script
 // IMPL_FONT_ATTR_OTHERSTYLE    - OldStyle, ... so negativ points
-#define IMPL_FONT_ATTR_DEFAULT       ((ULONG)0x00000001)
-#define IMPL_FONT_ATTR_STANDARD      ((ULONG)0x00000002)
-#define IMPL_FONT_ATTR_NORMAL        ((ULONG)0x00000004)
-#define IMPL_FONT_ATTR_SYMBOL        ((ULONG)0x00000008)
-#define IMPL_FONT_ATTR_FIXED         ((ULONG)0x00000010)
-#define IMPL_FONT_ATTR_SANSSERIF     ((ULONG)0x00000020)
-#define IMPL_FONT_ATTR_SERIF         ((ULONG)0x00000040)
-#define IMPL_FONT_ATTR_DECORATIVE    ((ULONG)0x00000080)
-#define IMPL_FONT_ATTR_SPECIAL       ((ULONG)0x00000100)
-#define IMPL_FONT_ATTR_ITALIC        ((ULONG)0x00000200)
-#define IMPL_FONT_ATTR_TITLING       ((ULONG)0x00000400)
-#define IMPL_FONT_ATTR_CAPITALS      ((ULONG)0x00000800)
-#define IMPL_FONT_ATTR_CJK           ((ULONG)0x00001000)
-#define IMPL_FONT_ATTR_CJK_JP        ((ULONG)0x00002000)
-#define IMPL_FONT_ATTR_CJK_SC        ((ULONG)0x00004000)
-#define IMPL_FONT_ATTR_CJK_TC        ((ULONG)0x00008000)
-#define IMPL_FONT_ATTR_CJK_KR        ((ULONG)0x00010000)
-#define IMPL_FONT_ATTR_CTL           ((ULONG)0x00020000)
-#define IMPL_FONT_ATTR_NONELATIN     ((ULONG)0x00040000)
-#define IMPL_FONT_ATTR_FULL          ((ULONG)0x00080000)
-#define IMPL_FONT_ATTR_OUTLINE       ((ULONG)0x00100000)
-#define IMPL_FONT_ATTR_SHADOW        ((ULONG)0x00200000)
-#define IMPL_FONT_ATTR_ROUNDED       ((ULONG)0x00400000)
-#define IMPL_FONT_ATTR_TYPEWRITER    ((ULONG)0x00800000)
-#define IMPL_FONT_ATTR_SCRIPT        ((ULONG)0x01000000)
-#define IMPL_FONT_ATTR_HANDWRITING   ((ULONG)0x02000000)
-#define IMPL_FONT_ATTR_CHANCERY      ((ULONG)0x04000000)
-#define IMPL_FONT_ATTR_COMIC         ((ULONG)0x08000000)
-#define IMPL_FONT_ATTR_BRUSHSCRIPT   ((ULONG)0x10000000)
-#define IMPL_FONT_ATTR_GOTHIC        ((ULONG)0x20000000)
-#define IMPL_FONT_ATTR_SCHOOLBOOK    ((ULONG)0x40000000)
-#define IMPL_FONT_ATTR_OTHERSTYLE    ((ULONG)0x80000000)
+#define IMPL_FONT_ATTR_DEFAULT       ((sal_uLong)0x00000001)
+#define IMPL_FONT_ATTR_STANDARD      ((sal_uLong)0x00000002)
+#define IMPL_FONT_ATTR_NORMAL        ((sal_uLong)0x00000004)
+#define IMPL_FONT_ATTR_SYMBOL        ((sal_uLong)0x00000008)
+#define IMPL_FONT_ATTR_FIXED         ((sal_uLong)0x00000010)
+#define IMPL_FONT_ATTR_SANSSERIF     ((sal_uLong)0x00000020)
+#define IMPL_FONT_ATTR_SERIF         ((sal_uLong)0x00000040)
+#define IMPL_FONT_ATTR_DECORATIVE    ((sal_uLong)0x00000080)
+#define IMPL_FONT_ATTR_SPECIAL       ((sal_uLong)0x00000100)
+#define IMPL_FONT_ATTR_ITALIC        ((sal_uLong)0x00000200)
+#define IMPL_FONT_ATTR_TITLING       ((sal_uLong)0x00000400)
+#define IMPL_FONT_ATTR_CAPITALS      ((sal_uLong)0x00000800)
+#define IMPL_FONT_ATTR_CJK           ((sal_uLong)0x00001000)
+#define IMPL_FONT_ATTR_CJK_JP        ((sal_uLong)0x00002000)
+#define IMPL_FONT_ATTR_CJK_SC        ((sal_uLong)0x00004000)
+#define IMPL_FONT_ATTR_CJK_TC        ((sal_uLong)0x00008000)
+#define IMPL_FONT_ATTR_CJK_KR        ((sal_uLong)0x00010000)
+#define IMPL_FONT_ATTR_CTL           ((sal_uLong)0x00020000)
+#define IMPL_FONT_ATTR_NONELATIN     ((sal_uLong)0x00040000)
+#define IMPL_FONT_ATTR_FULL          ((sal_uLong)0x00080000)
+#define IMPL_FONT_ATTR_OUTLINE       ((sal_uLong)0x00100000)
+#define IMPL_FONT_ATTR_SHADOW        ((sal_uLong)0x00200000)
+#define IMPL_FONT_ATTR_ROUNDED       ((sal_uLong)0x00400000)
+#define IMPL_FONT_ATTR_TYPEWRITER    ((sal_uLong)0x00800000)
+#define IMPL_FONT_ATTR_SCRIPT        ((sal_uLong)0x01000000)
+#define IMPL_FONT_ATTR_HANDWRITING   ((sal_uLong)0x02000000)
+#define IMPL_FONT_ATTR_CHANCERY      ((sal_uLong)0x04000000)
+#define IMPL_FONT_ATTR_COMIC         ((sal_uLong)0x08000000)
+#define IMPL_FONT_ATTR_BRUSHSCRIPT   ((sal_uLong)0x10000000)
+#define IMPL_FONT_ATTR_GOTHIC        ((sal_uLong)0x20000000)
+#define IMPL_FONT_ATTR_SCHOOLBOOK    ((sal_uLong)0x40000000)
+#define IMPL_FONT_ATTR_OTHERSTYLE    ((sal_uLong)0x80000000)
 
 #define IMPL_FONT_ATTR_CJK_ALLLANG   (IMPL_FONT_ATTR_CJK_JP | IMPL_FONT_ATTR_CJK_SC | IMPL_FONT_ATTR_CJK_TC | IMPL_FONT_ATTR_CJK_KR)
 #define IMPL_FONT_ATTR_ALLSCRIPT     (IMPL_FONT_ATTR_SCRIPT | IMPL_FONT_ATTR_HANDWRITING | IMPL_FONT_ATTR_CHANCERY | IMPL_FONT_ATTR_COMIC | IMPL_FONT_ATTR_BRUSHSCRIPT)
@@ -220,7 +220,7 @@ public:
                                                                    rtl::OUString(),
                                                                    rtl::OUString() )
                                      ) const;
-    static void getMapName( const String& rOrgName, String& rShortName, String& rFamilyName, FontWeight& rWeight, FontWidth& rWidth, ULONG& rType );
+    static void getMapName( const String& rOrgName, String& rShortName, String& rFamilyName, FontWeight& rWeight, FontWidth& rWidth, sal_uLong& rType );
 };
 
 } // namespace utl
diff --git a/unotools/inc/unotools/fontcvt.hxx b/unotools/inc/unotools/fontcvt.hxx
index b5f912d97c70..12d937cb62e4 100644
--- a/unotools/inc/unotools/fontcvt.hxx
+++ b/unotools/inc/unotools/fontcvt.hxx
@@ -36,12 +36,12 @@
 // - FontToSubsFont -
 // ------------------
 
-#define FONTTOSUBSFONT_IMPORT                   ((ULONG)0x00000001)
-#define FONTTOSUBSFONT_EXPORT                   ((ULONG)0x00000002)
-#define FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS     ((ULONG)0x00000004)
+#define FONTTOSUBSFONT_IMPORT                   ((sal_uLong)0x00000001)
+#define FONTTOSUBSFONT_EXPORT                   ((sal_uLong)0x00000002)
+#define FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS     ((sal_uLong)0x00000004)
 
 typedef void* FontToSubsFontConverter;
-UNOTOOLS_DLLPUBLIC FontToSubsFontConverter     CreateFontToSubsFontConverter( const String& rFontName, ULONG nFlags );
+UNOTOOLS_DLLPUBLIC FontToSubsFontConverter     CreateFontToSubsFontConverter( const String& rFontName, sal_uLong nFlags );
 UNOTOOLS_DLLPUBLIC void                        DestroyFontToSubsFontConverter( FontToSubsFontConverter hConverter );
 UNOTOOLS_DLLPUBLIC sal_Unicode                 ConvertFontToSubsFontChar( FontToSubsFontConverter hConverter, sal_Unicode c );
 UNOTOOLS_DLLPUBLIC String                      GetFontToSubsFontName( FontToSubsFontConverter hConverter );
diff --git a/unotools/inc/unotools/fontdefs.hxx b/unotools/inc/unotools/fontdefs.hxx
index c48076f14b29..12d9c43a109d 100644
--- a/unotools/inc/unotools/fontdefs.hxx
+++ b/unotools/inc/unotools/fontdefs.hxx
@@ -41,12 +41,12 @@ namespace utl {
 // - SubsFontName -
 // ----------------
 
-#define SUBSFONT_ONLYONE    ((ULONG)0x00000001)
-#define SUBSFONT_MS         ((ULONG)0x00000002)
-#define SUBSFONT_PS         ((ULONG)0x00000004)
-#define SUBSFONT_HTML       ((ULONG)0x00000008)
+#define SUBSFONT_ONLYONE    ((sal_uLong)0x00000001)
+#define SUBSFONT_MS         ((sal_uLong)0x00000002)
+#define SUBSFONT_PS         ((sal_uLong)0x00000004)
+#define SUBSFONT_HTML       ((sal_uLong)0x00000008)
 
-UNOTOOLS_DLLPUBLIC String GetSubsFontName( const String& rName, ULONG nFlags );
+UNOTOOLS_DLLPUBLIC String GetSubsFontName( const String& rName, sal_uLong nFlags );
 
 // -----------------
 // - FontTokenName -
@@ -80,29 +80,29 @@ public:
 
 
 // Default-Font
-#define DEFAULTFONT_SANS_UNICODE        ((USHORT)1)
-#define DEFAULTFONT_SANS                ((USHORT)2)
-#define DEFAULTFONT_SERIF               ((USHORT)3)
-#define DEFAULTFONT_FIXED               ((USHORT)4)
-#define DEFAULTFONT_SYMBOL              ((USHORT)5)
-#define DEFAULTFONT_UI_SANS             ((USHORT)1000)
-#define DEFAULTFONT_UI_FIXED            ((USHORT)1001)
-#define DEFAULTFONT_LATIN_TEXT          ((USHORT)2000)
-#define DEFAULTFONT_LATIN_PRESENTATION  ((USHORT)2001)
-#define DEFAULTFONT_LATIN_SPREADSHEET   ((USHORT)2002)
-#define DEFAULTFONT_LATIN_HEADING       ((USHORT)2003)
-#define DEFAULTFONT_LATIN_DISPLAY       ((USHORT)2004)
-#define DEFAULTFONT_LATIN_FIXED         ((USHORT)2005)
-#define DEFAULTFONT_CJK_TEXT            ((USHORT)3000)
-#define DEFAULTFONT_CJK_PRESENTATION    ((USHORT)3001)
-#define DEFAULTFONT_CJK_SPREADSHEET     ((USHORT)3002)
-#define DEFAULTFONT_CJK_HEADING         ((USHORT)3003)
-#define DEFAULTFONT_CJK_DISPLAY         ((USHORT)3004)
-#define DEFAULTFONT_CTL_TEXT            ((USHORT)4000)
-#define DEFAULTFONT_CTL_PRESENTATION    ((USHORT)4001)
-#define DEFAULTFONT_CTL_SPREADSHEET     ((USHORT)4002)
-#define DEFAULTFONT_CTL_HEADING         ((USHORT)4003)
-#define DEFAULTFONT_CTL_DISPLAY         ((USHORT)4004)
+#define DEFAULTFONT_SANS_UNICODE        ((sal_uInt16)1)
+#define DEFAULTFONT_SANS                ((sal_uInt16)2)
+#define DEFAULTFONT_SERIF               ((sal_uInt16)3)
+#define DEFAULTFONT_FIXED               ((sal_uInt16)4)
+#define DEFAULTFONT_SYMBOL              ((sal_uInt16)5)
+#define DEFAULTFONT_UI_SANS             ((sal_uInt16)1000)
+#define DEFAULTFONT_UI_FIXED            ((sal_uInt16)1001)
+#define DEFAULTFONT_LATIN_TEXT          ((sal_uInt16)2000)
+#define DEFAULTFONT_LATIN_PRESENTATION  ((sal_uInt16)2001)
+#define DEFAULTFONT_LATIN_SPREADSHEET   ((sal_uInt16)2002)
+#define DEFAULTFONT_LATIN_HEADING       ((sal_uInt16)2003)
+#define DEFAULTFONT_LATIN_DISPLAY       ((sal_uInt16)2004)
+#define DEFAULTFONT_LATIN_FIXED         ((sal_uInt16)2005)
+#define DEFAULTFONT_CJK_TEXT            ((sal_uInt16)3000)
+#define DEFAULTFONT_CJK_PRESENTATION    ((sal_uInt16)3001)
+#define DEFAULTFONT_CJK_SPREADSHEET     ((sal_uInt16)3002)
+#define DEFAULTFONT_CJK_HEADING         ((sal_uInt16)3003)
+#define DEFAULTFONT_CJK_DISPLAY         ((sal_uInt16)3004)
+#define DEFAULTFONT_CTL_TEXT            ((sal_uInt16)4000)
+#define DEFAULTFONT_CTL_PRESENTATION    ((sal_uInt16)4001)
+#define DEFAULTFONT_CTL_SPREADSHEET     ((sal_uInt16)4002)
+#define DEFAULTFONT_CTL_HEADING         ((sal_uInt16)4003)
+#define DEFAULTFONT_CTL_DISPLAY         ((sal_uInt16)4004)
 
 UNOTOOLS_DLLPUBLIC String GetNextFontToken( const String& rTokenStr, xub_StrLen& rIndex );
 
diff --git a/unotools/inc/unotools/intlwrapper.hxx b/unotools/inc/unotools/intlwrapper.hxx
index 4273d3611ddf..d614a2088e4e 100644
--- a/unotools/inc/unotools/intlwrapper.hxx
+++ b/unotools/inc/unotools/intlwrapper.hxx
@@ -70,7 +70,7 @@ private:
             void                ImplNewCharClass() const;
             void                ImplNewLocaleData() const;
             void                ImplNewCalendar() const;
-            void                ImplNewCollator( BOOL bCaseSensitive ) const;
+            void                ImplNewCollator( sal_Bool bCaseSensitive ) const;
 
 
 public:
@@ -109,14 +109,14 @@ public:
     const CollatorWrapper*      getCollator() const
                                     {
                                         if ( !pCollator )
-                                            ImplNewCollator( FALSE );
+                                            ImplNewCollator( sal_False );
                                         return pCollator;
                                     }
     /// case sensitive collator
     const CollatorWrapper*      getCaseCollator() const
                                     {
                                         if ( !pCaseCollator )
-                                            ImplNewCollator( TRUE );
+                                            ImplNewCollator( sal_True );
                                         return pCaseCollator;
                                     }
 };
diff --git a/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx
index cecc0147b9d7..f1a2e119a2ed 100644
--- a/unotools/inc/unotools/lingucfg.hxx
+++ b/unotools/inc/unotools/lingucfg.hxx
@@ -53,89 +53,89 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguOptions
     ::com::sun::star::uno::Sequence< rtl::OUString >    aActiveDics;
     ::com::sun::star::uno::Sequence< rtl::OUString >    aActiveConvDics;
 
-    BOOL                                                bROActiveDics;
-    BOOL                                                bROActiveConvDics;
+    sal_Bool                                                bROActiveDics;
+    sal_Bool                                                bROActiveConvDics;
 
     // Hyphenator service specific options
-    INT16   nHyphMinLeading,
+    sal_Int16   nHyphMinLeading,
             nHyphMinTrailing,
             nHyphMinWordLength;
 
-    BOOL    bROHyphMinLeading,
+    sal_Bool    bROHyphMinLeading,
             bROHyphMinTrailing,
             bROHyphMinWordLength;
 
     // misc options (non-service specific)
-    INT16   nDefaultLanguage;
-    INT16   nDefaultLanguage_CJK;
-    INT16   nDefaultLanguage_CTL;
+    sal_Int16   nDefaultLanguage;
+    sal_Int16   nDefaultLanguage_CJK;
+    sal_Int16   nDefaultLanguage_CTL;
 
-    BOOL    bRODefaultLanguage;
-    BOOL    bRODefaultLanguage_CJK;
-    BOOL    bRODefaultLanguage_CTL;
+    sal_Bool    bRODefaultLanguage;
+    sal_Bool    bRODefaultLanguage_CJK;
+    sal_Bool    bRODefaultLanguage_CTL;
 
     // spelling options (non-service specific)
-    BOOL    bIsSpellSpecial;
-    BOOL    bIsSpellAuto;
-    BOOL    bIsSpellReverse;
+    sal_Bool    bIsSpellSpecial;
+    sal_Bool    bIsSpellAuto;
+    sal_Bool    bIsSpellReverse;
 
-    BOOL    bROIsSpellSpecial;
-    BOOL    bROIsSpellAuto;
-    BOOL    bROIsSpellReverse;
+    sal_Bool    bROIsSpellSpecial;
+    sal_Bool    bROIsSpellAuto;
+    sal_Bool    bROIsSpellReverse;
 
     // hyphenation options (non-service specific)
-    BOOL    bIsHyphSpecial;
-    BOOL    bIsHyphAuto;
+    sal_Bool    bIsHyphSpecial;
+    sal_Bool    bIsHyphAuto;
 
-    BOOL    bROIsHyphSpecial;
-    BOOL    bROIsHyphAuto;
+    sal_Bool    bROIsHyphSpecial;
+    sal_Bool    bROIsHyphAuto;
 
     // common to SpellChecker, Hyphenator and Thesaurus service
-    BOOL    bIsUseDictionaryList;
-    BOOL    bIsIgnoreControlCharacters;
+    sal_Bool    bIsUseDictionaryList;
+    sal_Bool    bIsIgnoreControlCharacters;
 
-    BOOL    bROIsUseDictionaryList;
-    BOOL    bROIsIgnoreControlCharacters;
+    sal_Bool    bROIsUseDictionaryList;
+    sal_Bool    bROIsIgnoreControlCharacters;
 
     // SpellChecker service specific options
-    BOOL    bIsSpellWithDigits,
+    sal_Bool    bIsSpellWithDigits,
             bIsSpellUpperCase,
             bIsSpellCapitalization;
 
-    BOOL    bROIsSpellWithDigits,
+    sal_Bool    bROIsSpellWithDigits,
             bROIsSpellUpperCase,
             bROIsSpellCapitalization;
 
     // text conversion specific options
-    BOOL    bIsIgnorePostPositionalWord;
-    BOOL    bIsAutoCloseDialog;
-    BOOL    bIsShowEntriesRecentlyUsedFirst;
-    BOOL    bIsAutoReplaceUniqueEntries;
-    BOOL    bIsDirectionToSimplified;
-    BOOL    bIsUseCharacterVariants;
-    BOOL    bIsTranslateCommonTerms;
-    BOOL    bIsReverseMapping;
-
-    BOOL    bROIsIgnorePostPositionalWord;
-    BOOL    bROIsAutoCloseDialog;
-    BOOL    bROIsShowEntriesRecentlyUsedFirst;
-    BOOL    bROIsAutoReplaceUniqueEntries;
-    BOOL    bROIsDirectionToSimplified;
-    BOOL    bROIsUseCharacterVariants;
-    BOOL    bROIsTranslateCommonTerms;
-    BOOL    bROIsReverseMapping;
+    sal_Bool    bIsIgnorePostPositionalWord;
+    sal_Bool    bIsAutoCloseDialog;
+    sal_Bool    bIsShowEntriesRecentlyUsedFirst;
+    sal_Bool    bIsAutoReplaceUniqueEntries;
+    sal_Bool    bIsDirectionToSimplified;
+    sal_Bool    bIsUseCharacterVariants;
+    sal_Bool    bIsTranslateCommonTerms;
+    sal_Bool    bIsReverseMapping;
+
+    sal_Bool    bROIsIgnorePostPositionalWord;
+    sal_Bool    bROIsAutoCloseDialog;
+    sal_Bool    bROIsShowEntriesRecentlyUsedFirst;
+    sal_Bool    bROIsAutoReplaceUniqueEntries;
+    sal_Bool    bROIsDirectionToSimplified;
+    sal_Bool    bROIsUseCharacterVariants;
+    sal_Bool    bROIsTranslateCommonTerms;
+    sal_Bool    bROIsReverseMapping;
 
     // check value need to determine if the configuration needs to updatet
     // or not (used for a quick check if data files have been changed/added
     // or deleted
-    INT32   nDataFilesChangedCheckValue;
-    BOOL    bRODataFilesChangedCheckValue;
+    sal_Int32   nDataFilesChangedCheckValue;
+    sal_Bool    bRODataFilesChangedCheckValue;
 
-    BOOL    bIsGrammarAuto;
-    BOOL    bIsGrammarInteractive;
+    sal_Bool    bIsGrammarAuto;
+    sal_Bool    bIsGrammarInteractive;
 
-    BOOL    bROIsGrammarAuto;
-    BOOL    bROIsGrammarInteractive;
+    sal_Bool    bROIsGrammarAuto;
+    sal_Bool    bROIsGrammarInteractive;
 
     SvtLinguOptions();
 };
@@ -197,29 +197,29 @@ public:
     com::sun::star::uno::Any
             GetProperty( const rtl::OUString &rPropertyName ) const;
     com::sun::star::uno::Any
-            GetProperty( INT32 nPropertyHandle ) const;
+            GetProperty( sal_Int32 nPropertyHandle ) const;
 
-    BOOL    SetProperty( const rtl::OUString &rPropertyName,
+    sal_Bool    SetProperty( const rtl::OUString &rPropertyName,
                          const com::sun::star::uno::Any &rValue );
-    BOOL    SetProperty( INT32 nPropertyHandle,
+    sal_Bool    SetProperty( sal_Int32 nPropertyHandle,
                          const com::sun::star::uno::Any &rValue );
 
-    BOOL    GetOptions( SvtLinguOptions &rOptions ) const;
-    BOOL    SetOptions( const SvtLinguOptions &rOptions );
+    sal_Bool    GetOptions( SvtLinguOptions &rOptions ) const;
+    sal_Bool    SetOptions( const SvtLinguOptions &rOptions );
 
-    BOOL    IsReadOnly( const rtl::OUString &rPropertyName ) const;
-    BOOL    IsReadOnly( INT32 nPropertyHandle ) const;
+    sal_Bool    IsReadOnly( const rtl::OUString &rPropertyName ) const;
+    sal_Bool    IsReadOnly( sal_Int32 nPropertyHandle ) const;
 
     //!
     //! the following functions work on the 'ServiceManager' sub node of the
     //! linguistic configuration only
     //!
-    BOOL GetElementNamesFor( const rtl::OUString &rNodeName, com::sun::star::uno::Sequence< rtl::OUString > &rElementNames ) const;
+    sal_Bool GetElementNamesFor( const rtl::OUString &rNodeName, com::sun::star::uno::Sequence< rtl::OUString > &rElementNames ) const;
     //
-    BOOL GetSupportedDictionaryFormatsFor( const rtl::OUString &rSetName, const rtl::OUString &rSetEntry, com::sun::star::uno::Sequence< rtl::OUString > &rFormatList ) const;
+    sal_Bool GetSupportedDictionaryFormatsFor( const rtl::OUString &rSetName, const rtl::OUString &rSetEntry, com::sun::star::uno::Sequence< rtl::OUString > &rFormatList ) const;
     void SetOrCreateSupportedDictionaryFormatsFor( const rtl::OUString &rSetName, const rtl::OUString &rSetEntry, const com::sun::star::uno::Sequence< rtl::OUString > &rFormatList  ) const;
     //
-    BOOL GetDictionaryEntry( const rtl::OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const;
+    sal_Bool GetDictionaryEntry( const rtl::OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const;
     void SetOrCreateDictionaryEntry( const rtl::OUString &rNodeName, const SvtLinguConfigDictionaryEntry &rDicEntry ) const;
     //
     com::sun::star::uno::Sequence< rtl::OUString > GetDisabledDictionaries() const;
diff --git a/unotools/inc/unotools/localedatawrapper.hxx b/unotools/inc/unotools/localedatawrapper.hxx
index 865bddb455b3..306316683b94 100644
--- a/unotools/inc/unotools/localedatawrapper.hxx
+++ b/unotools/inc/unotools/localedatawrapper.hxx
@@ -64,7 +64,7 @@ enum MeasurementSystem {
 
 class UNOTOOLS_DLLPUBLIC LocaleDataWrapper
 {
-    static  BYTE                nLocaleDataChecking;    // 0:=dontknow, 1:=yes, 2:=no
+    static  sal_uInt8                nLocaleDataChecking;    // 0:=dontknow, 1:=yes, 2:=no
 
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    xSMgr;
     ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData2 >            xLD;
@@ -80,11 +80,11 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper
     String                      aCurrBankSymbol;
     int                         nDateFormat;
     int                         nLongDateFormat;
-    USHORT                      nCurrPositiveFormat;
-    USHORT                      nCurrNegativeFormat;
-    USHORT                      nCurrDigits;
-    BOOL                        bLocaleDataItemValid;
-    BOOL                        bReservedWordValid;
+    sal_uInt16                      nCurrPositiveFormat;
+    sal_uInt16                      nCurrNegativeFormat;
+    sal_uInt16                      nCurrDigits;
+    sal_Bool                        bLocaleDataItemValid;
+    sal_Bool                        bReservedWordValid;
     mutable ::utl::ReadWriteMutex   aMutex;
 
     // dummies, to be implemented or provided by XML locale data
@@ -118,8 +118,8 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper
             void                getDefaultCalendarImpl();
 
             sal_Unicode*        ImplAddFormatNum( sal_Unicode* pBuf,
-                                    sal_Int64 nNumber, USHORT nDecimals,
-                                    BOOL bUseThousandSep, BOOL bTrailingZeros ) const;
+                                    sal_Int64 nNumber, sal_uInt16 nDecimals,
+                                    sal_Bool bUseThousandSep, sal_Bool bTrailingZeros ) const;
 
             void                getDigitGroupingImpl();
 
@@ -241,19 +241,19 @@ public:
     // currency
             const String&       getCurrSymbol() const;
             const String&       getCurrBankSymbol() const;
-            USHORT              getCurrPositiveFormat() const;
-            USHORT              getCurrNegativeFormat() const;
-            USHORT              getCurrDigits() const;
+            sal_uInt16              getCurrPositiveFormat() const;
+            sal_uInt16              getCurrNegativeFormat() const;
+            sal_uInt16              getCurrDigits() const;
 
     // simple date and time formatting
             DateFormat          getDateFormat() const;
             DateFormat          getLongDateFormat() const;
                                 /// only numerical values of Gregorian calendar
             String              getDate( const Date& rDate ) const;
-            String              getTime( const Time& rTime, BOOL bSec = TRUE,
-                                    BOOL b100Sec = FALSE ) const;
+            String              getTime( const Time& rTime, sal_Bool bSec = sal_True,
+                                    sal_Bool b100Sec = sal_False ) const;
             String              getDuration( const Time& rTime,
-                                    BOOL bSec = TRUE, BOOL b100Sec = FALSE ) const;
+                                    sal_Bool bSec = sal_True, sal_Bool b100Sec = sal_False ) const;
 
                                 /** The CalendarWrapper already <b>MUST</b>
                                     have loaded a calendar.
@@ -282,37 +282,37 @@ public:
                                     @param nNumber
                                         value * 10**nDecimals
                                     @param bTrailingZeros
-                                    </TRUE>  := always display trailing zeros in
+                                    </sal_True>  := always display trailing zeros in
                                         decimal places, even if integer value.
-                                    </FALSE> := trailing zeros are only displayed
+                                    </sal_False> := trailing zeros are only displayed
                                         if the value is not an integer value.
                                  */
-            String              getNum( sal_Int64 nNumber, USHORT nDecimals,
-                                    BOOL bUseThousandSep = TRUE,
-                                    BOOL bTrailingZeros = TRUE ) const;
+            String              getNum( sal_Int64 nNumber, sal_uInt16 nDecimals,
+                                    sal_Bool bUseThousandSep = sal_True,
+                                    sal_Bool bTrailingZeros = sal_True ) const;
 
                                 /// "Secure" currency formatted string.
-            String              getCurr( sal_Int64 nNumber, USHORT nDecimals,
+            String              getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals,
                                     const String& rCurrencySymbol,
-                                    BOOL bUseThousandSep = TRUE ) const;
+                                    sal_Bool bUseThousandSep = sal_True ) const;
                                 /** Default currency formatted string, use with
                                     care as default currency may change in any
                                     locale, for example, DEM -> EUR */
-            String              getCurr( sal_Int64 nNumber, USHORT nDecimals,
-                                        BOOL bUseThousandSep = TRUE ) const
+            String              getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals,
+                                        sal_Bool bUseThousandSep = sal_True ) const
                                     { return getCurr( nNumber, nDecimals,
                                         getCurrSymbol(), bUseThousandSep ); }
 
     // dummy returns, to be implemented
     inline  sal_Unicode         getCurrZeroChar() const
                                     { return cCurrZeroChar; }
-    inline  BOOL                isNumLeadingZero() const
-                                    { return TRUE; }
+    inline  sal_Bool                isNumLeadingZero() const
+                                    { return sal_True; }
                                 /// standard decimal places
-    inline  USHORT              getNumDigits() const
+    inline  sal_uInt16              getNumDigits() const
                                     { return 2; }
-    inline  BOOL                isNumTrailingZeros() const
-                                    { return TRUE; }
+    inline  sal_Bool                isNumTrailingZeros() const
+                                    { return sal_True; }
 
 
     // reserved words
diff --git a/unotools/inc/unotools/misccfg.hxx b/unotools/inc/unotools/misccfg.hxx
index 030a433bc6e3..39777fc0b3d7 100644
--- a/unotools/inc/unotools/misccfg.hxx
+++ b/unotools/inc/unotools/misccfg.hxx
@@ -44,14 +44,14 @@ public:
     MiscCfg( );
     virtual ~MiscCfg( );
 
-    BOOL        IsNotFoundWarning()     const;
-    void        SetNotFoundWarning( BOOL bSet);
+    sal_Bool        IsNotFoundWarning()     const;
+    void        SetNotFoundWarning( sal_Bool bSet);
 
-    BOOL        IsPaperSizeWarning()    const;
-    void        SetPaperSizeWarning(BOOL bSet);
+    sal_Bool        IsPaperSizeWarning()    const;
+    void        SetPaperSizeWarning(sal_Bool bSet);
 
-    BOOL        IsPaperOrientationWarning()     const;
-    void        SetPaperOrientationWarning( BOOL bSet);
+    sal_Bool        IsPaperOrientationWarning()     const;
+    void        SetPaperOrientationWarning( sal_Bool bSet);
 
                 // 0 ... 99
     sal_Int32   GetYear2000()           const;
diff --git a/unotools/inc/unotools/pathoptions.hxx b/unotools/inc/unotools/pathoptions.hxx
index 7b471ed68a1d..53e6ccaca463 100644
--- a/unotools/inc/unotools/pathoptions.hxx
+++ b/unotools/inc/unotools/pathoptions.hxx
@@ -102,7 +102,7 @@ public:
     const String&   GetUIConfigPath() const;
     const String&   GetFingerprintPath() const;
 
-    BOOL            IsPathReadonly(Pathes ePath)const;
+    sal_Bool            IsPathReadonly(Pathes ePath)const;
     const String&   GetPath(Pathes ePath) const;
 
     // set the pathes
@@ -130,8 +130,9 @@ public:
     void            SetWorkPath( const String& rPath );
     void            SetPath( SvtPathOptions::Pathes ePath, const String& rNewPath );
 
-    String          SubstituteVariable( const String& rVar );
-    String          UseVariable( const String& rVar );
+    String          SubstituteVariable( const String& rVar ) const;
+    String          ExpandMacros( const String& rPath ) const;
+    String          UseVariable( const String& rVar ) const;
     sal_Bool        SearchFile( String& rIniFile, Pathes ePath = PATH_USERCONFIG );
     ::com::sun::star::lang::Locale GetLocale() const;
     sal_Bool        IsReadonly() const;
diff --git a/unotools/inc/unotools/searchopt.hxx b/unotools/inc/unotools/searchopt.hxx
index d8cf6819f389..10ed2ca79bce 100644
--- a/unotools/inc/unotools/searchopt.hxx
+++ b/unotools/inc/unotools/searchopt.hxx
@@ -48,71 +48,71 @@ public:
     SvtSearchOptions();
     ~SvtSearchOptions();
 
-    INT32   GetTransliterationFlags() const;
+    sal_Int32   GetTransliterationFlags() const;
 
     //
     // General Options
     //
 
-    BOOL    IsWholeWordsOnly() const;
-    BOOL    IsBackwards() const;
-    BOOL    IsUseRegularExpression() const;
-    BOOL    IsSearchForStyles() const;
-    BOOL    IsSimilaritySearch() const;
-    BOOL    IsUseAsianOptions() const;
-    BOOL    IsMatchCase() const;            // also Japanese search option
-    BOOL    IsNotes() const;
-
-    void    SetWholeWordsOnly( BOOL bVal );
-    void    SetBackwards( BOOL bVal );
-    void    SetUseRegularExpression( BOOL bVal );
-    void    SetSearchForStyles( BOOL bVal );
-    void    SetSimilaritySearch( BOOL bVal );
-    void    SetUseAsianOptions( BOOL bVal );
-    void    SetMatchCase( BOOL bVal );      // also Japanese search option
-    void    SetNotes( BOOL bVal);
+    sal_Bool    IsWholeWordsOnly() const;
+    sal_Bool    IsBackwards() const;
+    sal_Bool    IsUseRegularExpression() const;
+    sal_Bool    IsSearchForStyles() const;
+    sal_Bool    IsSimilaritySearch() const;
+    sal_Bool    IsUseAsianOptions() const;
+    sal_Bool    IsMatchCase() const;            // also Japanese search option
+    sal_Bool    IsNotes() const;
+
+    void    SetWholeWordsOnly( sal_Bool bVal );
+    void    SetBackwards( sal_Bool bVal );
+    void    SetUseRegularExpression( sal_Bool bVal );
+    void    SetSearchForStyles( sal_Bool bVal );
+    void    SetSimilaritySearch( sal_Bool bVal );
+    void    SetUseAsianOptions( sal_Bool bVal );
+    void    SetMatchCase( sal_Bool bVal );      // also Japanese search option
+    void    SetNotes( sal_Bool bVal);
 
     //
     // Japanese search options
     //
 
-    BOOL    IsMatchFullHalfWidthForms() const;
-    BOOL    IsMatchHiraganaKatakana() const;
-    BOOL    IsMatchContractions() const;
-    BOOL    IsMatchMinusDashChoon() const;
-    BOOL    IsMatchRepeatCharMarks() const;
-    BOOL    IsMatchVariantFormKanji() const;
-    BOOL    IsMatchOldKanaForms() const;
-    BOOL    IsMatchDiziDuzu() const;
-    BOOL    IsMatchBavaHafa() const;
-    BOOL    IsMatchTsithichiDhizi() const;
-    BOOL    IsMatchHyuiyuByuvyu() const;
-    BOOL    IsMatchSesheZeje() const;
-    BOOL    IsMatchIaiya() const;
-    BOOL    IsMatchKiku() const;
-    BOOL    IsIgnorePunctuation() const;
-    BOOL    IsIgnoreWhitespace() const;
-    BOOL    IsIgnoreProlongedSoundMark() const;
-    BOOL    IsIgnoreMiddleDot() const;
-
-    void    SetMatchFullHalfWidthForms( BOOL bVal );
-    void    SetMatchHiraganaKatakana( BOOL bVal );
-    void    SetMatchContractions( BOOL bVal );
-    void    SetMatchMinusDashChoon( BOOL bVal );
-    void    SetMatchRepeatCharMarks( BOOL bVal );
-    void    SetMatchVariantFormKanji( BOOL bVal );
-    void    SetMatchOldKanaForms( BOOL bVal );
-    void    SetMatchDiziDuzu( BOOL bVal );
-    void    SetMatchBavaHafa( BOOL bVal );
-    void    SetMatchTsithichiDhizi( BOOL bVal );
-    void    SetMatchHyuiyuByuvyu( BOOL bVal );
-    void    SetMatchSesheZeje( BOOL bVal );
-    void    SetMatchIaiya( BOOL bVal );
-    void    SetMatchKiku( BOOL bVal );
-    void    SetIgnorePunctuation( BOOL bVal );
-    void    SetIgnoreWhitespace( BOOL bVal );
-    void    SetIgnoreProlongedSoundMark( BOOL bVal );
-    void    SetIgnoreMiddleDot( BOOL bVal );
+    sal_Bool    IsMatchFullHalfWidthForms() const;
+    sal_Bool    IsMatchHiraganaKatakana() const;
+    sal_Bool    IsMatchContractions() const;
+    sal_Bool    IsMatchMinusDashChoon() const;
+    sal_Bool    IsMatchRepeatCharMarks() const;
+    sal_Bool    IsMatchVariantFormKanji() const;
+    sal_Bool    IsMatchOldKanaForms() const;
+    sal_Bool    IsMatchDiziDuzu() const;
+    sal_Bool    IsMatchBavaHafa() const;
+    sal_Bool    IsMatchTsithichiDhizi() const;
+    sal_Bool    IsMatchHyuiyuByuvyu() const;
+    sal_Bool    IsMatchSesheZeje() const;
+    sal_Bool    IsMatchIaiya() const;
+    sal_Bool    IsMatchKiku() const;
+    sal_Bool    IsIgnorePunctuation() const;
+    sal_Bool    IsIgnoreWhitespace() const;
+    sal_Bool    IsIgnoreProlongedSoundMark() const;
+    sal_Bool    IsIgnoreMiddleDot() const;
+
+    void    SetMatchFullHalfWidthForms( sal_Bool bVal );
+    void    SetMatchHiraganaKatakana( sal_Bool bVal );
+    void    SetMatchContractions( sal_Bool bVal );
+    void    SetMatchMinusDashChoon( sal_Bool bVal );
+    void    SetMatchRepeatCharMarks( sal_Bool bVal );
+    void    SetMatchVariantFormKanji( sal_Bool bVal );
+    void    SetMatchOldKanaForms( sal_Bool bVal );
+    void    SetMatchDiziDuzu( sal_Bool bVal );
+    void    SetMatchBavaHafa( sal_Bool bVal );
+    void    SetMatchTsithichiDhizi( sal_Bool bVal );
+    void    SetMatchHyuiyuByuvyu( sal_Bool bVal );
+    void    SetMatchSesheZeje( sal_Bool bVal );
+    void    SetMatchIaiya( sal_Bool bVal );
+    void    SetMatchKiku( sal_Bool bVal );
+    void    SetIgnorePunctuation( sal_Bool bVal );
+    void    SetIgnoreWhitespace( sal_Bool bVal );
+    void    SetIgnoreProlongedSoundMark( sal_Bool bVal );
+    void    SetIgnoreMiddleDot( sal_Bool bVal );
 };
 
 
diff --git a/unotools/inc/unotools/syslocaleoptions.hxx b/unotools/inc/unotools/syslocaleoptions.hxx
index dc3721bcaba7..7d70ebd589b3 100644..100755
--- a/unotools/inc/unotools/syslocaleoptions.hxx
+++ b/unotools/inc/unotools/syslocaleoptions.hxx
@@ -39,10 +39,10 @@
 #include <unotools/options.hxx>
 
 // bits for broadcasting hints of changes in a SfxSimpleHint, may be combined
-const ULONG SYSLOCALEOPTIONS_HINT_LOCALE    = 0x00000001;
-const ULONG SYSLOCALEOPTIONS_HINT_CURRENCY  = 0x00000002;
-const ULONG SYSLOCALEOPTIONS_HINT_UILOCALE  = 0x00000004;
-const ULONG SYSLOCALEOPTIONS_HINT_DECSEP    = 0x00000008;
+const sal_uLong SYSLOCALEOPTIONS_HINT_LOCALE    = 0x00000001;
+const sal_uLong SYSLOCALEOPTIONS_HINT_CURRENCY  = 0x00000002;
+const sal_uLong SYSLOCALEOPTIONS_HINT_UILOCALE  = 0x00000004;
+const sal_uLong SYSLOCALEOPTIONS_HINT_DECSEP    = 0x00000008;
 
 class SvtSysLocaleOptions_Impl;
 class SvtListener;
@@ -93,8 +93,8 @@ public:
         @ATTENTION
         All SvtSysLocaleOptions instances point to exactly one refcounted
         internal representation instance and broadcast blocks are counted.
-        Thus if you issue a BlockBroadcasts(TRUE) you MUST issue a matching
-        BlockBroadcasts(FALSE) or otherwise pending hints would never be
+        Thus if you issue a BlockBroadcasts(sal_True) you MUST issue a matching
+        BlockBroadcasts(sal_False) or otherwise pending hints would never be
         broadcasted again.
      */
        virtual void                BlockBroadcasts( bool bBlock );
diff --git a/unotools/inc/unotools/textsearch.hxx b/unotools/inc/unotools/textsearch.hxx
index 664105bb8b47..bbc40cda01bd 100644
--- a/unotools/inc/unotools/textsearch.hxx
+++ b/unotools/inc/unotools/textsearch.hxx
@@ -82,9 +82,9 @@ private:
 public:
     SearchParam( const String &rText,
                     SearchType eSrchType = SearchParam::SRCH_NORMAL,
-                    BOOL bCaseSens = TRUE,
-                    BOOL bWrdOnly = FALSE,
-                    BOOL bSrchInSel = FALSE );
+                    sal_Bool bCaseSens = sal_True,
+                    sal_Bool bWrdOnly = sal_False,
+                    sal_Bool bSrchInSel = sal_False );
     SearchParam( const SearchParam& );
 
     const String&   GetSrchStr() const          { return sSrchStr; }
@@ -151,14 +151,14 @@ public:
         pStart  - start position for the search
         pEnde   - end position for the search
 
-        RETURN values   ==  TRUE: something is found
+        RETURN values   ==  sal_True: something is found
                         - pStart start pos of the found text,
                         - pStart end pos of the found text,
                         - pSrchResult - the search result with all found
                              positions. Is only filled with more positions
                              if the regular expression handles groups.
 
-                        == FALSE: nothing found, pStart,pEnde unchanged.
+                        == sal_False: nothing found, pStart,pEnde unchanged.
 
         Definitions: start pos always inclusive, end pos always exclusive!
                      The position must always in the right direction!
diff --git a/unotools/inc/unotools/ucbhelper.hxx b/unotools/inc/unotools/ucbhelper.hxx
index 7bfd0d4f4a8c..44af28b17ecc 100644
--- a/unotools/inc/unotools/ucbhelper.hxx
+++ b/unotools/inc/unotools/ucbhelper.hxx
@@ -74,12 +74,12 @@ namespace utl
                                                 sal_Bool bNewOnly = sal_False );
         static sal_Bool             HasParentFolder( const String& rFolder );
 
-        static ULONG                GetSize( const String& rContent );
+        static sal_uLong                GetSize( const String& rContent );
         static sal_Bool             IsYounger( const String& rIsYoung, const String& rIsOlder );
 
         static sal_Bool             Exists( const String& rContent );
-        static sal_Bool             FindInPath( const String& rPath, const String& rName, String& rFile, char cDelim = ';', BOOL bAllowWildCards = TRUE );
-        static sal_Bool             Find( const String& rFolder, const String& rName, String& rFile, BOOL bAllowWildCards = FALSE );
+        static sal_Bool             FindInPath( const String& rPath, const String& rName, String& rFile, char cDelim = ';', sal_Bool bAllowWildCards = sal_True );
+        static sal_Bool             Find( const String& rFolder, const String& rName, String& rFile, sal_Bool bAllowWildCards = sal_False );
         static sal_Bool             IsSubPath( const ::rtl::OUString& rPath, const ::rtl::OUString& rChildCandidate, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider >& xContentProvider = ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider >() );
         static sal_Bool             EqualURLs( const ::rtl::OUString& aFirstURL, const ::rtl::OUString& aSecondURL );
     };
diff --git a/unotools/inc/unotools/ucblockbytes.hxx b/unotools/inc/unotools/ucblockbytes.hxx
index a7090d5efebc..d3c53e882fec 100644
--- a/unotools/inc/unotools/ucblockbytes.hxx
+++ b/unotools/inc/unotools/ucblockbytes.hxx
@@ -91,7 +91,7 @@ public:
                     {}
 
     virtual void    Handle( LoadHandlerItem nWhich, UcbLockBytesRef xLockBytes ) = 0;
-    void            Activate( BOOL bActivate = sal_True ) { m_bActive = bActivate; }
+    void            Activate( sal_Bool bActivate = sal_True ) { m_bActive = bActivate; }
     sal_Bool        IsActive() const { return m_bActive; }
 };
 
@@ -152,11 +152,11 @@ public:
     static UcbLockBytesRef  CreateLockBytes( const NS_UNO::Reference < NS_IO::XStream >& xContent );
 
     // SvLockBytes
-    virtual void            SetSynchronMode (BOOL bSynchron);
-    virtual ErrCode         ReadAt ( ULONG nPos, void *pBuffer, ULONG nCount, ULONG *pRead) const;
-    virtual ErrCode         WriteAt ( ULONG, const void*, ULONG, ULONG *pWritten);
+    virtual void            SetSynchronMode (sal_Bool bSynchron);
+    virtual ErrCode         ReadAt ( sal_uLong nPos, void *pBuffer, sal_uLong nCount, sal_uLong *pRead) const;
+    virtual ErrCode         WriteAt ( sal_uLong, const void*, sal_uLong, sal_uLong *pWritten);
     virtual ErrCode         Flush (void) const;
-    virtual ErrCode         SetSize (ULONG);
+    virtual ErrCode         SetSize (sal_uLong);
     virtual ErrCode         Stat ( SvLockBytesStat *pStat, SvLockBytesStatFlag) const;
 
     void                    SetError( ErrCode nError )
diff --git a/unotools/inc/unotools/unotunnelhelper.hxx b/unotools/inc/unotools/unotunnelhelper.hxx
index de9c82da995a..b573fef7b883 100644
--- a/unotools/inc/unotools/unotunnelhelper.hxx
+++ b/unotools/inc/unotools/unotunnelhelper.hxx
@@ -34,8 +34,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
-
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 
 namespace utl
 {
diff --git a/unotools/inc/unotools/useroptions.hxx b/unotools/inc/unotools/useroptions.hxx
index 7230e3bb2da6..17f4d52bc248 100644
--- a/unotools/inc/unotools/useroptions.hxx
+++ b/unotools/inc/unotools/useroptions.hxx
@@ -36,23 +36,23 @@
 
 // define ----------------------------------------------------------------
 
-#define USER_OPT_CITY               ((USHORT)0)
-#define USER_OPT_COMPANY            ((USHORT)1)
-#define USER_OPT_COUNTRY            ((USHORT)2)
-#define USER_OPT_EMAIL              ((USHORT)3)
-#define USER_OPT_FAX                ((USHORT)4)
-#define USER_OPT_FIRSTNAME          ((USHORT)5)
-#define USER_OPT_LASTNAME           ((USHORT)6)
-#define USER_OPT_POSITION           ((USHORT)7)
-#define USER_OPT_STATE              ((USHORT)8)
-#define USER_OPT_STREET             ((USHORT)9)
-#define USER_OPT_TELEPHONEHOME      ((USHORT)10)
-#define USER_OPT_TELEPHONEWORK      ((USHORT)11)
-#define USER_OPT_TITLE              ((USHORT)12)
-#define USER_OPT_ID                 ((USHORT)13)
-#define USER_OPT_ZIP                ((USHORT)14)
-#define USER_OPT_FATHERSNAME        ((USHORT)15)
-#define USER_OPT_APARTMENT          ((USHORT)16)
+#define USER_OPT_CITY               ((sal_uInt16)0)
+#define USER_OPT_COMPANY            ((sal_uInt16)1)
+#define USER_OPT_COUNTRY            ((sal_uInt16)2)
+#define USER_OPT_EMAIL              ((sal_uInt16)3)
+#define USER_OPT_FAX                ((sal_uInt16)4)
+#define USER_OPT_FIRSTNAME          ((sal_uInt16)5)
+#define USER_OPT_LASTNAME           ((sal_uInt16)6)
+#define USER_OPT_POSITION           ((sal_uInt16)7)
+#define USER_OPT_STATE              ((sal_uInt16)8)
+#define USER_OPT_STREET             ((sal_uInt16)9)
+#define USER_OPT_TELEPHONEHOME      ((sal_uInt16)10)
+#define USER_OPT_TELEPHONEWORK      ((sal_uInt16)11)
+#define USER_OPT_TITLE              ((sal_uInt16)12)
+#define USER_OPT_ID                 ((sal_uInt16)13)
+#define USER_OPT_ZIP                ((sal_uInt16)14)
+#define USER_OPT_FATHERSNAME        ((sal_uInt16)15)
+#define USER_OPT_APARTMENT          ((sal_uInt16)16)
 
 // class SvtUserOptions --------------------------------------------------
 
@@ -112,8 +112,8 @@ public:
     void            SetFathersName( const ::rtl::OUString& rNewToken );
     void            SetApartment( const ::rtl::OUString& rNewToken );
 
-    sal_Bool        IsTokenReadonly( USHORT nToken ) const;
-    ::rtl::OUString GetToken(USHORT nToken) const;
+    sal_Bool        IsTokenReadonly( sal_uInt16 nToken ) const;
+    ::rtl::OUString GetToken(sal_uInt16 nToken) const;
 };
 
 #endif // #ifndef INCLUDED_unotools_USEROPTIONS_HXX