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
author: Jan Holesovsky <kendy@suse.cz> 2011-03-11 14:24:23 +0100
committer: Jan Holesovsky <kendy@suse.cz> 2011-03-11 14:24:23 +0100
commit: 67d2af6fac2d9bad52a6b1f6e0cbd1229eb88a42 (patch)
tree: 898019746162b464578da9c8345158a74321c904 /svtools/source/misc
parent: 86fb5fff88be611785b7908aac2a44475d77705f (diff)
parent: e2a3d487efb2bd5e582eb10e4150530c3f7377c5 (diff)
28 files changed, 459 insertions, 1023 deletions
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 200163c0d3db..c18071664a03 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include "acceleratorexecute.hxx"
+#include <svtools/acceleratorexecute.hxx>
 
 //===============================================
 // includes
@@ -254,7 +254,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
     sal_Bool bMod1  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1  );
     sal_Bool bMod2  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2  );
     sal_Bool bMod3  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3  );
-    USHORT   nKey   = (USHORT)aAWTKey.KeyCode;
+    sal_uInt16   nKey   = (sal_uInt16)aAWTKey.KeyCode;
 
     return KeyCode(nKey, bShift, bMod1, bMod2, bMod3);
 }
diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx
index 741e62cb64a8..f059e5eb9c0b 100644
--- a/svtools/source/misc/cliplistener.cxx
+++ b/svtools/source/misc/cliplistener.cxx
@@ -35,7 +35,7 @@
 #include <vcl/window.hxx>
 #include <osl/mutex.hxx>
 
-#include "cliplistener.hxx"
+#include <svtools/cliplistener.hxx>
 #include <svtools/transfer.hxx>
 
 using namespace ::com::sun::star;
@@ -69,7 +69,7 @@ void SAL_CALL TransferableClipboardListener::changedContents(
     }
 }
 
-void TransferableClipboardListener::AddRemoveListener( Window* pWin, BOOL bAdd )
+void TransferableClipboardListener::AddRemoveListener( Window* pWin, sal_Bool bAdd )
 {
     try
     {
diff --git a/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx
index a1edf0e5b859..f07d24b536a9 100644
--- a/svtools/source/misc/dialogclosedlistener.cxx
+++ b/svtools/source/misc/dialogclosedlistener.cxx
@@ -27,7 +27,7 @@
  ************************************************************************/
 
 #include "precompiled_svtools.hxx"
-#include "dialogclosedlistener.hxx"
+#include <svtools/dialogclosedlistener.hxx>
 
 //.........................................................................
 namespace svt
diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx
index c46ebfa7f85d..d5e9ac545962 100644
--- a/svtools/source/misc/dialogcontrolling.cxx
+++ b/svtools/source/misc/dialogcontrolling.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include "dialogcontrolling.hxx"
+#include <svtools/dialogcontrolling.hxx>
 #include <vcl/window.hxx>
 
 #include <algorithm>
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index f146a84a969e..405b98588598 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -31,7 +31,7 @@
 #include <osl/mutex.hxx>
 #include <tools/debug.hxx>
 #include <tools/rcid.h>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #if defined(OS2)
@@ -41,13 +41,13 @@
 #include <svtools/ehdl.hxx>
 #include <svtools/svtdata.hxx>
 #include <svtools/svtools.hrc>
-#include "sfxecode.hxx"
+#include <svtools/sfxecode.hxx>
 
 //=========================================================================
 
-static USHORT aWndFunc(
+static sal_uInt16 aWndFunc(
     Window *pWin,            // Parent des Dialoges
-    USHORT nFlags,
+    sal_uInt16 nFlags,
     const String &rErr,      // Fehlertext
     const String &rAction)   // Actiontext
 
@@ -130,7 +130,7 @@ static USHORT aWndFunc(
         }
     }
 
-    USHORT nRet = RET_CANCEL;
+    sal_uInt16 nRet = RET_CANCEL;
     switch ( pBox->Execute() )
     {
         case RET_OK:
@@ -158,7 +158,7 @@ static USHORT aWndFunc(
 
 //-------------------------------------------------------------------------
 
-SfxErrorHandler::SfxErrorHandler(USHORT nIdP, ULONG lStartP, ULONG lEndP, ResMgr *pMgrP) :
+SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong lStartP, sal_uLong lEndP, ResMgr *pMgrP) :
 
     lStart(lStartP), lEnd(lEndP), nId(nIdP), pMgr(pMgrP), pFreeMgr( NULL )
 
@@ -181,8 +181,8 @@ SfxErrorHandler::~SfxErrorHandler()
 
 //-------------------------------------------------------------------------
 
-BOOL SfxErrorHandler::CreateString(
-    const ErrorInfo *pErr, String &rStr, USHORT& nFlags) const
+sal_Bool SfxErrorHandler::CreateString(
+    const ErrorInfo *pErr, String &rStr, sal_uInt16& nFlags) const
 
 /*  [Beschreibung]
 
@@ -191,9 +191,9 @@ BOOL SfxErrorHandler::CreateString(
     */
 
 {
-    ULONG nErrCode = pErr->GetErrorCode() & ERRCODE_ERROR_MASK;
+    sal_uLong nErrCode = pErr->GetErrorCode() & ERRCODE_ERROR_MASK;
     if( nErrCode>=lEnd || nErrCode<=lStart )
-        return FALSE;
+        return sal_False;
     MessageInfo *pMsgInfo=PTR_CAST(MessageInfo,pErr);
     if(pMsgInfo)
     {
@@ -207,7 +207,7 @@ BOOL SfxErrorHandler::CreateString(
                     break;
                 i = i + pMsgInfo->GetMessageArg().Len();
             }
-            return TRUE;
+            return sal_True;
         }
     }
     else if(GetErrorString(nErrCode, rStr, nFlags))
@@ -227,10 +227,10 @@ BOOL SfxErrorHandler::CreateString(
             TwoStringErrorInfo * pTwoStringInfo = PTR_CAST(TwoStringErrorInfo,
                                                            pErr);
             if (pTwoStringInfo)
-                for (USHORT i = 0; i < rStr.Len();)
+                for (sal_uInt16 i = 0; i < rStr.Len();)
                 {
-                    USHORT nArg1Pos = rStr.Search(String::CreateFromAscii( "$(ARG1)" ), i);
-                    USHORT nArg2Pos = rStr.Search(String::CreateFromAscii( "$(ARG2)" ), i);
+                    sal_uInt16 nArg1Pos = rStr.Search(String::CreateFromAscii( "$(ARG1)" ), i);
+                    sal_uInt16 nArg2Pos = rStr.Search(String::CreateFromAscii( "$(ARG2)" ), i);
                     if (nArg1Pos < nArg2Pos)
                     {
                         rStr.Replace(nArg1Pos, 7, pTwoStringInfo->GetArg1());
@@ -244,9 +244,9 @@ BOOL SfxErrorHandler::CreateString(
                     else break;
                 }
         }
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //-------------------------------------------------------------------------
@@ -261,9 +261,9 @@ class ResString: public String
     */
 
 {
-    USHORT nFlags;
+    sal_uInt16 nFlags;
   public:
-    USHORT GetFlags() const {return nFlags;}
+    sal_uInt16 GetFlags() const {return nFlags;}
     const String & GetString() const {return *this;}
     ResString( ResId &rId);
 };
@@ -271,14 +271,14 @@ class ResString: public String
 //-------------------------------------------------------------------------
 
 ResString::ResString(ResId & rId):
-    String(rId.SetAutoRelease(FALSE)),
+    String(rId.SetAutoRelease(sal_False)),
     nFlags(0)
 {
     ResMgr * pResMgr = rId.GetResMgr();
      // String ctor temporarily sets global ResManager
     if (pResMgr->GetRemainSize())
-        nFlags = USHORT(pResMgr->ReadShort());
-    rId.SetAutoRelease(TRUE);
+        nFlags = sal_uInt16(pResMgr->ReadShort());
+    rId.SetAutoRelease(sal_True);
     pResMgr->PopContext();
 }
 
@@ -295,18 +295,18 @@ struct ErrorResource_Impl : private Resource
 
     ResId aResId;
 
-    ErrorResource_Impl(ResId& rErrIdP, USHORT nId)
+    ErrorResource_Impl(ResId& rErrIdP, sal_uInt16 nId)
         : Resource(rErrIdP),aResId(nId,*rErrIdP.GetResMgr()){}
 
     ~ErrorResource_Impl() { FreeResource(); }
 
     operator ResString(){ return ResString( aResId ); }
-    operator BOOL(){return IsAvailableRes(aResId.SetRT(RSC_STRING));}
+    operator sal_Bool(){return IsAvailableRes(aResId.SetRT(RSC_STRING));}
 
 };
 
 
-BOOL SfxErrorHandler::GetClassString(ULONG lClassId, String &rStr) const
+sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, String &rStr) const
 
 /*  [Beschreibung]
 
@@ -316,17 +316,17 @@ BOOL SfxErrorHandler::GetClassString(ULONG lClassId, String &rStr) const
     */
 
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     com::sun::star::lang::Locale aLocale( Application::GetSettings().GetUILocale() );
     ResMgr* pResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(ofa), aLocale );
     if( pResMgr )
     {
         ResId aId(RID_ERRHDL, *pResMgr );
-        ErrorResource_Impl aEr(aId, (USHORT)lClassId);
+        ErrorResource_Impl aEr(aId, (sal_uInt16)lClassId);
         if(aEr)
         {
             rStr=((ResString)aEr).GetString();
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
     delete pResMgr;
@@ -335,8 +335,8 @@ BOOL SfxErrorHandler::GetClassString(ULONG lClassId, String &rStr) const
 
 //-------------------------------------------------------------------------
 
-BOOL SfxErrorHandler::GetMessageString(
-    ULONG lErrId, String &rStr, USHORT &nFlags) const
+sal_Bool SfxErrorHandler::GetMessageString(
+    sal_uLong lErrId, String &rStr, sal_uInt16 &nFlags) const
 
 /*  [Beschreibung]
 
@@ -345,18 +345,18 @@ BOOL SfxErrorHandler::GetMessageString(
     */
 
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     ResId *pResId= new ResId(nId, *pMgr);
 
-    ErrorResource_Impl aEr(*pResId, (USHORT)lErrId);
+    ErrorResource_Impl aEr(*pResId, (sal_uInt16)lErrId);
     if(aEr)
     {
         ResString aErrorString(aEr);
-        USHORT nResFlags = aErrorString.GetFlags();
+        sal_uInt16 nResFlags = aErrorString.GetFlags();
         if( nResFlags )
             nFlags=aErrorString.GetFlags();
         rStr = aErrorString.GetString();
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     delete pResId;
@@ -365,8 +365,8 @@ BOOL SfxErrorHandler::GetMessageString(
 
 //-------------------------------------------------------------------------
 
-BOOL SfxErrorHandler::GetErrorString(
-    ULONG lErrId, String &rStr, USHORT &nFlags) const
+sal_Bool SfxErrorHandler::GetErrorString(
+    sal_uLong lErrId, String &rStr, sal_uInt16 &nFlags) const
 
 /*  [Beschreibung]
     Erzeugt den Fehlerstring fuer den eigentlichen Fehler ohne
@@ -377,25 +377,25 @@ BOOL SfxErrorHandler::GetErrorString(
 {
     SolarMutexGuard aGuard;
 
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     rStr=String(SvtResId(RID_ERRHDL_CLASS));
     ResId aResId(nId, *pMgr);
 
     {
-        ErrorResource_Impl aEr(aResId, (USHORT)lErrId);
+        ErrorResource_Impl aEr(aResId, (sal_uInt16)lErrId);
         if(aEr)
         {
             ResString aErrorString(aEr);
 
-            USHORT nResFlags = aErrorString.GetFlags();
+            sal_uInt16 nResFlags = aErrorString.GetFlags();
             if ( nResFlags )
                 nFlags = nResFlags;
             rStr.SearchAndReplace(
                 String::CreateFromAscii("$(ERROR)"), aErrorString.GetString());
-            bRet = TRUE;
+            bRet = sal_True;
         }
         else
-            bRet = FALSE;
+            bRet = sal_False;
     }
 
     if( bRet )
@@ -414,7 +414,7 @@ BOOL SfxErrorHandler::GetErrorString(
 //-------------------------------------------------------------------------
 
 SfxErrorContext::SfxErrorContext(
-    USHORT nCtxIdP, Window *pWindow, USHORT nResIdP, ResMgr *pMgrP)
+    sal_uInt16 nCtxIdP, Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP)
 :   ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP)
 {
     if( nResId==USHRT_MAX )
@@ -424,8 +424,8 @@ SfxErrorContext::SfxErrorContext(
 //-------------------------------------------------------------------------
 
 SfxErrorContext::SfxErrorContext(
-    USHORT nCtxIdP, const String &aArg1P, Window *pWindow,
-    USHORT nResIdP, ResMgr *pMgrP)
+    sal_uInt16 nCtxIdP, const String &aArg1P, Window *pWindow,
+    sal_uInt16 nResIdP, ResMgr *pMgrP)
 :   ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP),
     aArg1(aArg1P)
 {
@@ -435,7 +435,7 @@ SfxErrorContext::SfxErrorContext(
 
 //-------------------------------------------------------------------------
 
-BOOL SfxErrorContext::GetString(ULONG nErrId, String &rStr)
+sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, String &rStr)
 
 /*  [Beschreibung]
 
@@ -471,7 +471,7 @@ BOOL SfxErrorContext::GetString(ULONG nErrId, String &rStr)
 
         if ( bRet )
         {
-            USHORT nId = ( nErrId & ERRCODE_WARNING_MASK ) ? ERRCTX_WARNING : ERRCTX_ERROR;
+            sal_uInt16 nId = ( nErrId & ERRCODE_WARNING_MASK ) ? ERRCTX_WARNING : ERRCTX_ERROR;
             ResId aSfxResId( RID_ERRCTX, *pMgr );
             ErrorResource_Impl aEr( aSfxResId, nId );
             rStr.SearchAndReplace( String::CreateFromAscii( "$(ERR)" ), ( (ResString)aEr ).GetString() );
diff --git a/svtools/source/misc/ehdl.src b/svtools/source/misc/ehdl.src
index 436e06b7f3c5..2c2fab3e19b5 100644
--- a/svtools/source/misc/ehdl.src
+++ b/svtools/source/misc/ehdl.src
@@ -27,7 +27,8 @@
 
 #define __RSC
 #include <svtools/svtools.hrc>
-#include "sfxecode.hxx"
+#include <svtools/sfxecode.hxx>
+
  // pragma ----------------------------------------------------------------
 
 String STR_ERR_HDLMESS
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 1ae633cad254..59479c39d4b7 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -236,7 +236,7 @@ struct EmbeddedObjectRef_Impl
     comphelper::EmbeddedObjectContainer*        pContainer;
     Graphic*                                    pGraphic;
     sal_Int64                                   nViewAspect;
-    BOOL                                        bIsLocked;
+    sal_Bool                                        bIsLocked;
     sal_Bool                                    bNeedUpdate;
 
     // #i104867#
@@ -250,7 +250,7 @@ void EmbeddedObjectRef::Construct_Impl()
     mpImp->pContainer = 0;
     mpImp->pGraphic = 0;
     mpImp->nViewAspect = embed::Aspects::MSOLE_CONTENT;
-    mpImp->bIsLocked = FALSE;
+    mpImp->bIsLocked = sal_False;
     mpImp->bNeedUpdate = sal_False;
     mpImp->mnGraphicVersion = 0;
     mpImp->aDefaultSizeForChart_In_100TH_MM = awt::Size(8000,7000);
@@ -306,6 +306,7 @@ void EmbeddedObjectRef::Assign( const NS_UNO::Reference < NS_EMBED::XEmbeddedObj
     mpImp->xListener = EmbedEventListener_Impl::Create( this );
 
     //#i103460#
+    if ( IsChart() )
     {
         ::com::sun::star::uno::Reference < ::com::sun::star::chart2::XDefaultSizeTransmitter > xSizeTransmitter( xObj, uno::UNO_QUERY );
         DBG_ASSERT( xSizeTransmitter.is(), "Object does not support XDefaultSizeTransmitter -> will cause #i103460#!" );
@@ -360,7 +361,7 @@ void EmbeddedObjectRef::Clear()
     }
 
     mpImp->pContainer = 0;
-    mpImp->bIsLocked = FALSE;
+    mpImp->bIsLocked = sal_False;
     mpImp->bNeedUpdate = sal_False;
 }
 
@@ -402,17 +403,17 @@ void EmbeddedObjectRef::SetViewAspect( sal_Int64 nAspect )
     mpImp->nViewAspect = nAspect;
 }
 
-void EmbeddedObjectRef::Lock( BOOL bLock )
+void EmbeddedObjectRef::Lock( sal_Bool bLock )
 {
     mpImp->bIsLocked = bLock;
 }
 
-BOOL EmbeddedObjectRef::IsLocked() const
+sal_Bool EmbeddedObjectRef::IsLocked() const
 {
     return mpImp->bIsLocked;
 }
 
-void EmbeddedObjectRef::GetReplacement( BOOL bUpdate )
+void EmbeddedObjectRef::GetReplacement( sal_Bool bUpdate )
 {
     if ( bUpdate )
     {
@@ -449,7 +450,7 @@ Graphic* EmbeddedObjectRef::GetGraphic( ::rtl::OUString* pMediaType ) const
         // bNeedUpdate will be set to false while retrieving new replacement
         const_cast < EmbeddedObjectRef* >(this)->GetReplacement( sal_True );
     else if ( !mpImp->pGraphic )
-        const_cast < EmbeddedObjectRef* >(this)->GetReplacement( FALSE );
+        const_cast < EmbeddedObjectRef* >(this)->GetReplacement( sal_False );
 
     if ( mpImp->pGraphic && pMediaType )
         *pMediaType = mpImp->aMediaType;
@@ -561,7 +562,7 @@ void EmbeddedObjectRef::SetGraphic( const Graphic& rGraphic, const ::rtl::OUStri
     mpImp->bNeedUpdate = sal_False;
 }
 
-SvStream* EmbeddedObjectRef::GetGraphicStream( BOOL bUpdate ) const
+SvStream* EmbeddedObjectRef::GetGraphicStream( sal_Bool bUpdate ) const
 {
     RTL_LOGFILE_CONTEXT( aLog, "svtools (mv76033) svt::EmbeddedObjectRef::GetGraphicStream" );
     DBG_ASSERT( bUpdate || mpImp->pContainer, "Can't retrieve current graphic!" );
@@ -615,7 +616,7 @@ void EmbeddedObjectRef::DrawPaintReplacement( const Rectangle &rRect, const Stri
     MapMode aMM( MAP_APPFONT );
     Size aAppFontSz = pOut->LogicToLogic( Size( 0, 8 ), &aMM, NULL );
     Font aFnt( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Helvetica" ) ), aAppFontSz );
-    aFnt.SetTransparent( TRUE );
+    aFnt.SetTransparent( sal_True );
     aFnt.SetColor( Color( COL_LIGHTRED ) );
     aFnt.SetWeight( WEIGHT_BOLD );
     aFnt.SetFamily( FAMILY_SWISS );
@@ -627,14 +628,14 @@ void EmbeddedObjectRef::DrawPaintReplacement( const Rectangle &rRect, const Stri
     Point aPt;
     // Nun den Text so skalieren, dass er in das Rect passt.
     // Wir fangen mit der Defaultsize an und gehen 1-AppFont runter
-    for( USHORT i = 8; i > 2; i-- )
+    for( sal_uInt16 i = 8; i > 2; i-- )
     {
         aPt.X() = (rRect.GetWidth()  - pOut->GetTextWidth( rText )) / 2;
         aPt.Y() = (rRect.GetHeight() - pOut->GetTextHeight()) / 2;
 
-        BOOL bTiny = FALSE;
-        if( aPt.X() < 0 ) bTiny = TRUE, aPt.X() = 0;
-        if( aPt.Y() < 0 ) bTiny = TRUE, aPt.Y() = 0;
+        sal_Bool bTiny = sal_False;
+        if( aPt.X() < 0 ) bTiny = sal_True, aPt.X() = 0;
+        if( aPt.Y() < 0 ) bTiny = sal_True, aPt.Y() = 0;
         if( bTiny )
         {
             // heruntergehen bei kleinen Bildern
@@ -696,8 +697,8 @@ void EmbeddedObjectRef::DrawShading( const Rectangle &rRect, OutputDevice *pOut
     aPixSize.Width() -= 1;
     aPixSize.Height() -= 1;
     Point aPixViewPos = pOut->LogicToPixel( rRect.TopLeft() );
-    INT32 nMax = aPixSize.Width() + aPixSize.Height();
-    for( INT32 i = 5; i < nMax; i += 5 )
+    sal_Int32 nMax = aPixSize.Width() + aPixSize.Height();
+    for( sal_Int32 i = 5; i < nMax; i += 5 )
     {
         Point a1( aPixViewPos ), a2( aPixViewPos );
         if( i > aPixSize.Width() )
@@ -716,15 +717,15 @@ void EmbeddedObjectRef::DrawShading( const Rectangle &rRect, OutputDevice *pOut
 
 }
 
-BOOL EmbeddedObjectRef::TryRunningState()
+sal_Bool EmbeddedObjectRef::TryRunningState()
 {
     return TryRunningState( mxObj );
 }
 
-BOOL EmbeddedObjectRef::TryRunningState( const uno::Reference < embed::XEmbeddedObject >& xEmbObj )
+sal_Bool EmbeddedObjectRef::TryRunningState( const uno::Reference < embed::XEmbeddedObject >& xEmbObj )
 {
     if ( !xEmbObj.is() )
-        return FALSE;
+        return sal_False;
 
     try
     {
@@ -733,10 +734,10 @@ BOOL EmbeddedObjectRef::TryRunningState( const uno::Reference < embed::XEmbedded
     }
     catch ( uno::Exception& )
     {
-        return FALSE;
+        return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 void EmbeddedObjectRef::SetGraphicToContainer( const Graphic& rGraphic,
@@ -797,7 +798,7 @@ void EmbeddedObjectRef::UpdateReplacementOnDemand()
     }
 }
 
-BOOL EmbeddedObjectRef::IsChart() const
+sal_Bool EmbeddedObjectRef::IsChart() const
 {
     //todo maybe for 3.0:
     //if the changes work good for chart
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index 67d325cb41e5..34cf5c595e38 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/embed/Aspects.hpp>
 
 #include <svtools/embedtransfer.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <unotools/ucbstreamhelper.hxx>
@@ -111,21 +111,21 @@ sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::D
                         // TODO/LATER: Propbably the graphic should be copied here as well
                         // currently it is handled by the applications
                         utl::TempFile aTmp;
-                        aTmp.EnableKillingFile( TRUE );
+                        aTmp.EnableKillingFile( sal_True );
                         uno::Reference < embed::XEmbedPersist > xPers( m_xObj, uno::UNO_QUERY );
                         if ( xPers.is() )
                         {
                             uno::Reference < embed::XStorage > xStg = comphelper::OStorageHelper::GetTemporaryStorage();
                             ::rtl::OUString aName( RTL_CONSTASCII_USTRINGPARAM( "Dummy" ));
                             SvStream* pStream = NULL;
-                            BOOL bDeleteStream = FALSE;
+                            sal_Bool bDeleteStream = sal_False;
                             uno::Sequence < beans::PropertyValue > aEmpty;
                             xPers->storeToEntry( xStg, aName, aEmpty, aEmpty );
                             if ( xStg->isStreamElement( aName ) )
                             {
                                 uno::Reference < io::XStream > xStm = xStg->cloneStreamElement( aName );
                                 pStream = utl::UcbStreamHelper::CreateStream( xStm );
-                                bDeleteStream = TRUE;
+                                bDeleteStream = sal_True;
                             }
                             else
                             {
@@ -252,7 +252,7 @@ void SvEmbedTransferHelper::FillTransferableObjectDescriptor( TransferableObject
     rDesc.maSize = OutputDevice::LogicToLogic( aSize, aMapMode, MapMode( MAP_100TH_MM ) );
     rDesc.maDragStartPos = Point();
     rDesc.maDisplayName = String();
-    rDesc.mbCanLink = FALSE;
+    rDesc.mbCanLink = sal_False;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src
deleted file mode 100644
index 08514ea23953..000000000000
--- a/svtools/source/misc/errtxt.src
+++ /dev/null
@@ -1,515 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define __RSC
-#include <svtools/svtools.hrc>
-#include "sfxecode.hxx"
- // pragma ----------------------------------------------------------------
-Resource RID_ERRCTX
-{
-    String ERRCTX_ERROR
-    {
-        Text [ en-US ] = "Error" ;
-    };
-    String ERRCTX_WARNING
-    {
-        Text [ en-US ] = "Warning" ;
-    };
-    String ERRCTX_SFX_LOADTEMPLATE
-    {
-        Text [ en-US ] = "$(ERR) loading the template $(ARG1)" ;
-    };
-    String ERRCTX_SFX_SAVEDOC
-    {
-        Text [ en-US ] = "$(ERR) saving the document $(ARG1)";
-    };
-    String ERRCTX_SFX_SAVEASDOC
-    {
-        Text [ en-US ] = "$(ERR) saving the document $(ARG1)";
-    };
-    String ERRCTX_SFX_DOCINFO
-    {
-        Text [ en-US ] = "$(ERR) displaying doc. information for document $(ARG1)" ;
-    };
-    String ERRCTX_SFX_DOCTEMPLATE
-    {
-        Text [ en-US ] = "$(ERR) writing document $(ARG1) as template" ;
-    };
-    String ERRCTX_SFX_MOVEORCOPYCONTENTS
-    {
-        Text [ en-US ] = "$(ERR) copying or moving document contents" ;
-    };
-    String ERRCTX_SFX_DOCMANAGER
-    {
-        Text [ en-US ] = "$(ERR) starting the Document Manager" ;
-    };
-    String ERRCTX_SFX_OPENDOC
-    {
-        Text [ en-US ] = "$(ERR) loading document $(ARG1)" ;
-    };
-    String ERRCTX_SFX_NEWDOCDIRECT
-    {
-        Text [ en-US ] = "$(ERR) creating a new document" ;
-    };
-    String ERRCTX_SFX_NEWDOC
-    {
-        Text [ en-US ] = "$(ERR) creating a new document" ;
-    };
-    String ERRCTX_SFX_CREATEOBJSH
-    {
-        Text [ en-US ] = "$(ERR) expanding entry" ;
-    };
-    String ERRCTX_SFX_LOADBASIC
-    {
-        Text [ en-US ] = "$(ERR) loading BASIC of document $(ARG1)" ;
-    };
-    String ERRCTX_SFX_SEARCHADDRESS
-    {
-        Text [ en-US ] = "$(ERR) searching for an address";
-    };
-};
-
-Resource RID_ERRHDL
-{
-    String ERRCODE_CLASS_ABORT
-    {
-        Text [ en-US ] = "Abort" ;
-    };
-    String ERRCODE_CLASS_NOTEXISTS
-    {
-        Text [ en-US ] = "Nonexistent object" ;
-    };
-    String ERRCODE_CLASS_ALREADYEXISTS
-    {
-        Text [ en-US ] = "Object already exists" ;
-    };
-    String ERRCODE_CLASS_ACCESS
-    {
-        Text [ en-US ] = "Object not accessible" ;
-    };
-    String ERRCODE_CLASS_PATH
-    {
-        Text [ en-US ] = "Inadmissible path" ;
-    };
-    String ERRCODE_CLASS_LOCKING
-    {
-        Text [ en-US ] = "Locking problem" ;
-    };
-    String ERRCODE_CLASS_PARAMETER
-    {
-        Text [ en-US ] = "Wrong parameter" ;
-    };
-    String ERRCODE_CLASS_SPACE
-    {
-        Text [ en-US ] = "Resource exhausted" ;
-    };
-    String ERRCODE_CLASS_NOTSUPPORTED
-    {
-        Text [ en-US ] = "Action not supported" ;
-    };
-    String ERRCODE_CLASS_READ
-    {
-        Text [ en-US ] = "Read-Error" ;
-    };
-    String ERRCODE_CLASS_WRITE
-    {
-        Text [ en-US ] = "Write Error" ;
-    };
-    String ERRCODE_CLASS_UNKNOWN
-    {
-        Text [ en-US ] = "unknown" ;
-    };
-    String ERRCODE_CLASS_VERSION
-    {
-        Text [ en-US ] = "Version Incompatibility" ;
-    };
-    String ERRCODE_CLASS_GENERAL
-    {
-        Text [ en-US ] = "General Error" ;
-    };
-    String ERRCODE_CLASS_FORMAT
-    {
-        Text [ en-US ] = "Incorrect format" ;
-    };
-    String ERRCODE_CLASS_CREATE
-    {
-        Text [ en-US ] = "Error creating object" ;
-    };
-    String ERRCODE_CLASS_SBX
-    {
-        Text [ en-US ] = "Inadmissible value or data type" ;
-    };
-    String ERRCODE_CLASS_RUNTIME
-    {
-        Text [ en-US ] = "BASIC runtime error" ;
-    };
-    String ERRCODE_CLASS_COMPILER
-    {
-        Text [ en-US ] = "BASIC syntax error" ;
-    };
-    String 1
-    {
-        Text [ en-US ] = "General Error" ;
-    };
-    String ERRCODE_IO_GENERAL
-    {
-        Text [ en-US ] = "General input/output error." ;
-    };
-    String ERRCODE_IO_MISPLACEDCHAR
-    {
-        Text [ en-US ] = "Invalid file name." ;
-    };
-    String ERRCODE_IO_NOTEXISTS
-    {
-        Text [ en-US ] = "Nonexistent file." ;
-    };
-    String ERRCODE_IO_ALREADYEXISTS
-    {
-        Text [ en-US ] = "File already exists." ;
-    };
-    String ERRCODE_IO_NOTADIRECTORY
-    {
-        Text [ en-US ] = "The object is not a directory." ;
-    };
-    String ERRCODE_IO_NOTAFILE
-    {
-        Text [ en-US ] = "The object is not a file." ;
-    };
-    String ERRCODE_IO_INVALIDDEVICE
-    {
-        Text [ en-US ] = "The specified device is invalid." ;
-    };
-    String ERRCODE_IO_ACCESSDENIED
-    {
-        Text [ en-US ] = "The object cannot be accessed\ndue to insufficient user rights." ;
-    };
-    String ERRCODE_IO_LOCKVIOLATION
-    {
-        Text [ en-US ] = "Sharing violation while accessing the object." ;
-    };
-    String ERRCODE_IO_OUTOFSPACE
-    {
-        Text [ en-US ] = "No more space on device." ;
-    };
-    String ERRCODE_IO_ISWILDCARD
-    {
-        Text [ en-US ] = "This operation cannot be run on\nfiles containing wildcards." ;
-    };
-    String ERRCODE_IO_NOTSUPPORTED
-    {
-        Text [ en-US ] = "This operation is not supported on this operating system." ;
-    };
-    String ERRCODE_IO_TOOMANYOPENFILES
-    {
-        Text [ en-US ] = "There are too many files open." ;
-    };
-    String ERRCODE_IO_CANTREAD
-    {
-        Text [ en-US ] = "Data could not be read from the file." ;
-    };
-    String ERRCODE_IO_CANTWRITE
-    {
-        Text [ en-US ] = "The file could not be written." ;
-    };
-    String ERRCODE_IO_OUTOFMEMORY
-    {
-        Text [ en-US ] = "The operation could not be run due to insufficient memory." ;
-    };
-    String ERRCODE_IO_CANTSEEK
-    {
-        Text [ en-US ] = "The seek operation could not be run." ;
-    };
-    String ERRCODE_IO_CANTTELL
-    {
-        Text [ en-US ] = "The tell operation could not be run." ;
-    };
-    String ERRCODE_IO_WRONGVERSION
-    {
-        Text [ en-US ] = "Incorrect file version." ;
-    };
-    String ERRCODE_IO_WRONGFORMAT
-    {
-        Text [ en-US ] = "Incorrect file format." ;
-    };
-    String ERRCODE_IO_INVALIDCHAR
-    {
-        Text [ en-US ] = "The file name contains invalid characters." ;
-    };
-    String ERRCODE_IO_UNKNOWN
-    {
-        Text [ en-US ] = "An unknown I/O error has occurred." ;
-    };
-    String ERRCODE_IO_INVALIDACCESS
-    {
-        Text [ en-US ] = "An invalid attempt was made to access the file." ;
-    };
-    String ERRCODE_IO_CANTCREATE
-    {
-        Text [ en-US ] = "The file could not be created." ;
-    };
-    String ERRCODE_IO_INVALIDPARAMETER
-    {
-        Text [ en-US ] = "The operation was started under an invalid parameter." ;
-    };
-    String ERRCODE_IO_ABORT
-    {
-        Text [ en-US ] = "The operation on the file was aborted." ;
-    };
-    String ERRCODE_IO_NOTEXISTSPATH
-    {
-        Text [ en-US ] = "Path to the file does not exist." ;
-    };
-    String ERRCODE_IO_RECURSIVE
-    {
-        Text [ en-US ] = "An object cannot be copied into itself." ;
-    };
-    String ERRCODE_SFX_NOSTDTEMPLATE
-    {
-        Text [ en-US ] = "The default template could not be opened." ;
-    };
-    String ERRCODE_SFX_TEMPLATENOTFOUND
-    {
-        Text [ en-US ] = "The specified template could not be found." ;
-    };
-    String ERRCODE_SFX_NOTATEMPLATE
-    {
-        Text [ en-US ] = "The file cannot be used as template." ;
-    };
-    String ERRCODE_SFX_CANTREADDOCINFO
-    {
-        Text [ en-US ] = "Document information could not be read from the file because\nthe document information format is unknown or because document information does not\nexist." ;
-    };
-    String ERRCODE_SFX_ALREADYOPEN
-    {
-        Text [ en-US ] = "This document has already been opened for editing." ;
-    };
-    String ERRCODE_SFX_WRONGPASSWORD
-    {
-        Text [ en-US ] = "The wrong password has been entered." ;
-    };
-    String ERRCODE_SFX_DOLOADFAILED
-    {
-        Text [ en-US ] = "Error reading file." ;
-    };
-    String ERRCODE_SFX_DOCUMENTREADONLY
-    {
-        Text [ en-US ] = "The document was opened as read-only." ;
-    };
-    String ERRCODE_SFX_OLEGENERAL
-    {
-        Text [ en-US ] = "General OLE Error." ;
-    };
-    String ERRCODE_INET_NAME_RESOLVE
-    {
-        Text [ en-US ] = "The host name $(ARG1) could not be resolved." ;
-    };
-    String ERRCODE_INET_CONNECT
-    {
-        Text [ en-US ] = "Could not establish network connection to $(ARG1)." ;
-    };
-    String ERRCODE_INET_READ
-    {
-        Text [ en-US ] = "Error reading data from the network.\nServer error message: $(ARG1)." ;
-    };
-    String ERRCODE_INET_WRITE
-    {
-        Text [ en-US ] = "Error transferring data to the network.\nServer error message: $(ARG1)." ;
-    };
-    String ERRCODE_INET_GENERAL
-    {
-        Text [ en-US ] = "General network error has occurred." ;
-    };
-    String ERRCODE_INET_OFFLINE
-    {
-        Text [ en-US ] = "The requested network data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ;
-    };
-    String ERRCODE_SFXMSG_STYLEREPLACE
-    {
-        ExtraData = ERRCODE_MSG_ERROR | ERRCODE_BUTTON_OK_CANCEL ;
-        Text [ en-US ] = "Should the $(ARG1) Style be replaced?" ;
-    };
-    String ERRCODE_SFX_NOFILTER
-    {
-        Text [ en-US ] = "A filter has not been found." ;
-    };
-    String ERRCODE_SFX_CANTFINDORIGINAL
-    {
-        Text [ en-US ] = "The original could not be determined." ;
-    };
-    String ERRCODE_SFX_CANTCREATECONTENT
-    {
-        Text [ en-US ] = "The contents could not be created." ;
-    };
-    String ERRCODE_SFX_CANTCREATELINK
-    {
-        Text [ en-US ] = "The link could not be created." ;
-    };
-    String ERRCODE_SFX_WRONGBMKFORMAT
-    {
-        Text [ en-US ] = "The link format is invalid." ;
-    };
-    String ERRCODE_SFX_WRONGICONFILE
-    {
-        Text [ en-US ] = "The configuration of the icon display is invalid." ;
-    };
-    String ERRCODE_SFX_CANTWRITEICONFILE
-    {
-        Text [ en-US ] = "The configuration of the icon display can not be saved." ;
-    };
-    String ERRCODE_SFX_CANTDELICONFILE
-    {
-        Text [ en-US ] = "The configuration of the icon display could not be deleted." ;
-    };
-    String ERRCODE_SFX_CANTRENAMECONTENT
-    {
-        Text [ en-US ] = "Contents cannot be renamed." ;
-    };
-    String ERRCODE_SFX_INVALIDBMKPATH
-    {
-        Text [ en-US ] = "The bookmark folder is invalid." ;
-    };
-    String ERRCODE_SFX_CANTWRITEURLCFGFILE
-    {
-        Text [ en-US ] = "The configuration of the URLs to be saved locally could not be saved." ;
-    };
-    String ERRCODE_SFX_WRONGURLCFGFORMAT
-    {
-        Text [ en-US ] = "The configuration format of the URLs to be saved locally is invalid." ;
-    };
-    String ERRCODE_SFX_NODOCUMENT
-    {
-        Text [ en-US ] = "This action cannot be applied to a document that does not exist." ;
-    };
-    String ERRCODE_SFX_INVALIDLINK
-    {
-        Text [ en-US ] = "The link refers to an invalid target." ;
-    };
-    String ERRCODE_SFX_INVALIDTRASHPATH
-    {
-        Text [ en-US ] = "The Recycle Bin path is invalid." ;
-    };
-    String ERRCODE_SFX_NOTRESTORABLE
-    {
-        Text [ en-US ] = "The entry could not be restored." ;
-    };
-    String ERRCODE_IO_NAMETOOLONG
-    {
-        Text [ en-US ] = "The file name is too long for the target file system." ;
-    };
-    String ERRCODE_SFX_CONSULTUSER
-    {
-        Text [ en-US ] = "The details for running the function are incomplete." ;
-    };
-    String ERRCODE_SFX_INVALIDSYNTAX
-    {
-        Text [ en-US ] = "The input syntax is invalid." ;
-    };
-    String ERRCODE_SFX_CANTCREATEFOLDER
-    {
-        Text [ en-US ] = "The input syntax is invalid." ;
-    };
-    String ERRCODE_SFX_CANTRENAMEFOLDER
-    {
-        Text [ en-US ] = "The input syntax is invalid." ;
-    };
-    String ERRCODE_SFX_WRONG_CDF_FORMAT
-    {
-        Text [ en-US ] = "The channel document has an invalid format." ;
-    };
-    String ERRCODE_SFX_EMPTY_SERVER
-    {
-        Text [ en-US ] = "The server must not be empty." ;
-    };
-    String ERRCODE_SFX_NO_ABOBOX
-    {
-        Text [ en-US ] = "A subscription folder is required to install a Channel." ;
-    };
-    String ERRCODE_IO_NOTSTORABLEINBINARYFORMAT
-    {
-        Text [ en-US ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME %PRODUCTVERSION file format.";
-    };
-    String ERRCODE_SFX_TARGETFILECORRUPTED
-    {
-        Text [ en-US ] = "The file $(FILENAME) cannot be saved. Please check your system settings. You can find an automatically generated backup copy of this file in folder $(PATH) named $(BACKUPNAME).";
-    };
-    String ERRCODE_SFX_NOMOREDOCUMENTSALLOWED
-    {
-        Text [ en-US ] = "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document.";
-    };
-    String ERRCODE_SFX_CANTCREATEBACKUP
-    {
-        Text [ en-US ] = "Could not create backup copy." ;
-    };
-    String ERRCODE_SFX_MACROS_SUPPORT_DISABLED
-    {
-        Text [ en-US ] = "An attempt was made to execute a macro.\nFor security reasons, macro support is disabled.";
-    };
-    String ERRCODE_SFX_DOCUMENT_MACRO_DISABLED
-    {
-        Text [ en-US ] = "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in Tools - Options - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ;
-    };
-    String ERRCODE_SFX_BROKENSIGNATURE
-    {
-        Text [ en-US ] = "The digitally signed document content and/or macros do not match the current document signature.\n\nThis could be the result of document manipulation or of structural document damage due to data transmission.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ;
-    };
-    String ERRCODE_SFX_INCOMPLETE_ENCRYPTION
-    {
-        Text [ en-US ] = "The encrypted document contains unexpected non-encrypted streams.\n\nThis could be the result of document manipulation.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ;
-    };
-
-    String ERRCODE_IO_INVALIDLENGTH
-    {
-        Text [ en-US ] = "Invalid data length." ;
-    };
-    String ERRCODE_IO_CURRENTDIR
-    {
-        Text [ en-US ] = "Function not possible: path contains current directory." ;
-    };
-    String ERRCODE_IO_NOTSAMEDEVICE
-    {
-        Text [ en-US ] = "Function not possible: device (drive) not identical." ;
-    };
-    String ERRCODE_IO_DEVICENOTREADY
-    {
-        Text [ en-US ] = "Device (drive) not ready." ;
-    };
-    String ERRCODE_IO_BADCRC
-    {
-        Text [ en-US ] = "Wrong check amount." ;
-    };
-    String ERRCODE_IO_WRITEPROTECTED
-    {
-        Text [ en-US ] = "Function not possible: write protected." ;
-    };
-    String ERRCODE_SFX_SHARED_NOPASSWORDCHANGE
-    {
-        Text [ en-US ] = "The password of a shared spreadsheet cannot be set or changed.\nDeactivate sharing mode first.";
-    };
-};
-
-// eof ------------------------------------------------------------------------
-
diff --git a/svtools/source/misc/helpagentwindow.cxx b/svtools/source/misc/helpagentwindow.cxx
index 46118ffbabfc..50a2341d1290 100644
--- a/svtools/source/misc/helpagentwindow.cxx
+++ b/svtools/source/misc/helpagentwindow.cxx
@@ -28,12 +28,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include "helpagentwindow.hxx"
+#include <svtools/helpagentwindow.hxx>
 #include <osl/diagnose.h>
 #include <vcl/button.hxx>
 #include <vcl/bitmap.hxx>
 #include <svtools/svtdata.hxx>
-
 #include <svtools/svtools.hrc>
 #include <svtools/helpid.hrc>
 
@@ -101,7 +100,7 @@ namespace svt
         m_aPreferredSize.Height() += aSize.Height() - aOutputSize.Height();
 
         SetPointer(Pointer(POINTER_REFHAND));
-        AlwaysEnableInput( TRUE, TRUE );
+        AlwaysEnableInput( sal_True, sal_True );
 
         // unique id for the testtool
         SetUniqueId( HID_HELPAGENT_WINDOW );
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index d17efb5f0287..0ee5a722df35 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -31,7 +31,7 @@
 
 // includes --------------------------------------------------------------
 
-#include "imagemgr.hxx"
+#include <svtools/imagemgr.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
@@ -50,167 +50,166 @@
 #include <tools/rcid.h>
 #include <rtl/logfile.hxx>
 #include <unotools/configmgr.hxx>
-
 #include <svtools/svtools.hrc>
-#include "imagemgr.hrc"
+#include <svtools/imagemgr.hrc>
 #include <svtools/svtdata.hxx>
 #include <osl/mutex.hxx>
 
 // globals *******************************************************************
 
-#define NO_INDEX        ((USHORT)0xFFFF)
+#define NO_INDEX        ((sal_uInt16)0xFFFF)
 #define CONTENT_HELPER  ::utl::UCBContentHelper
 #define ASCII_STRING(s) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
 
 struct SvtExtensionResIdMapping_Impl
 {
     const char*   _pExt;
-    BOOL    _bExt;
-    USHORT  _nStrId;
-    USHORT  _nImgId;
+    sal_Bool    _bExt;
+    sal_uInt16  _nStrId;
+    sal_uInt16  _nImgId;
 };
 
 static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] =
 {
-    { "awk",   TRUE,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "bas",   TRUE,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "bat",   TRUE,  STR_DESCRIPTION_BATCHFILE,             0 },
-    { "bmk",   FALSE, STR_DESCRIPTION_BOOKMARKFILE,          0 },
-    { "bmp",   TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_BITMAP },
-    { "c",     TRUE,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "cfg",   FALSE, STR_DESCRIPTION_CFGFILE,               0 },
-    { "cmd",   TRUE,  STR_DESCRIPTION_BATCHFILE,             0 },
-    { "cob",   TRUE,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "com",   TRUE,  STR_DESCRIPTION_APPLICATION,           0 },
-    { "cxx",   TRUE,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "dbf",   TRUE,  STR_DESCRIPTION_DATABASE_TABLE,        IMG_TABLE },
-    { "def",   TRUE,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "dll",   TRUE,  STR_DESCRIPTION_SYSFILE,               0 },
-    { "doc",   FALSE, STR_DESCRIPTION_WORD_DOC,              IMG_WRITER },
-    { "dot",   FALSE, STR_DESCRIPTION_WORD_DOC,              IMG_WRITERTEMPLATE },
-    { "docx",  FALSE, STR_DESCRIPTION_WORD_DOC,              IMG_WRITER },
-    { "dxf",   TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_DXF },
-    { "exe",   TRUE,  STR_DESCRIPTION_APPLICATION,           0 },
-    { "gif",   TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_GIF },
-    { "h",     TRUE,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "hlp",   FALSE, STR_DESCRIPTION_HELP_DOC,              0 },
-    { "hrc",   TRUE,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "htm",   FALSE, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
-    { "html",  FALSE, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
-    { "asp",   FALSE, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
-    { "hxx",   TRUE,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "ini",   FALSE, STR_DESCRIPTION_CFGFILE,               0 },
-    { "java",  TRUE,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "jpeg",  TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_JPG },
-    { "jpg",   TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_JPG },
-    { "lha",   TRUE,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "awk",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "bas",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "bat",   sal_True,  STR_DESCRIPTION_BATCHFILE,             0 },
+    { "bmk",   sal_False, STR_DESCRIPTION_BOOKMARKFILE,          0 },
+    { "bmp",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_BITMAP },
+    { "c",     sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "cfg",   sal_False, STR_DESCRIPTION_CFGFILE,               0 },
+    { "cmd",   sal_True,  STR_DESCRIPTION_BATCHFILE,             0 },
+    { "cob",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "com",   sal_True,  STR_DESCRIPTION_APPLICATION,           0 },
+    { "cxx",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "dbf",   sal_True,  STR_DESCRIPTION_DATABASE_TABLE,        IMG_TABLE },
+    { "def",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "dll",   sal_True,  STR_DESCRIPTION_SYSFILE,               0 },
+    { "doc",   sal_False, STR_DESCRIPTION_WORD_DOC,              IMG_WRITER },
+    { "dot",   sal_False, STR_DESCRIPTION_WORD_DOC,              IMG_WRITERTEMPLATE },
+    { "docx",  sal_False, STR_DESCRIPTION_WORD_DOC,              IMG_WRITER },
+    { "dxf",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_DXF },
+    { "exe",   sal_True,  STR_DESCRIPTION_APPLICATION,           0 },
+    { "gif",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_GIF },
+    { "h",     sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "hlp",   sal_False, STR_DESCRIPTION_HELP_DOC,              0 },
+    { "hrc",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "htm",   sal_False, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
+    { "html",  sal_False, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
+    { "asp",   sal_False, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
+    { "hxx",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "ini",   sal_False, STR_DESCRIPTION_CFGFILE,               0 },
+    { "java",  sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "jpeg",  sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_JPG },
+    { "jpg",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_JPG },
+    { "lha",   sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
 #ifdef WNT
-    { "lnk",   FALSE, 0,                                     0 },
+    { "lnk",   sal_False, 0,                                     0 },
 #endif
-    { "log",   TRUE,  STR_DESCRIPTION_LOGFILE,               0 },
-    { "lst",   TRUE,  STR_DESCRIPTION_LOGFILE,               0 },
-    { "met",   TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_MET },
-    { "mml",   FALSE, STR_DESCRIPTION_MATHML_DOC,            IMG_MATH },
-    { "mod",   TRUE,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "odb",   FALSE, STR_DESCRIPTION_OO_DATABASE_DOC,       IMG_OO_DATABASE_DOC },
-    { "odg",   FALSE, STR_DESCRIPTION_OO_DRAW_DOC,           IMG_OO_DRAW_DOC },
-    { "odf",   FALSE, STR_DESCRIPTION_OO_MATH_DOC,           IMG_OO_MATH_DOC },
-    { "odm",   FALSE, STR_DESCRIPTION_OO_GLOBAL_DOC,         IMG_OO_GLOBAL_DOC },
-    { "odp",   FALSE, STR_DESCRIPTION_OO_IMPRESS_DOC,        IMG_OO_IMPRESS_DOC },
-    { "ods",   FALSE, STR_DESCRIPTION_OO_CALC_DOC,           IMG_OO_CALC_DOC },
-    { "odt",   FALSE, STR_DESCRIPTION_OO_WRITER_DOC,         IMG_OO_WRITER_DOC },
-    { "otg",   FALSE, STR_DESCRIPTION_OO_DRAW_TEMPLATE,      IMG_OO_DRAW_TEMPLATE },
-    { "otp",   FALSE, STR_DESCRIPTION_OO_IMPRESS_TEMPLATE,   IMG_OO_IMPRESS_TEMPLATE },
-    { "ots",   FALSE, STR_DESCRIPTION_OO_CALC_TEMPLATE,      IMG_OO_CALC_TEMPLATE },
-    { "ott",   FALSE, STR_DESCRIPTION_OO_WRITER_TEMPLATE,    IMG_OO_WRITER_TEMPLATE },
-    { "pas",   TRUE,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "pcd",   TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PCD },
-    { "pct",   TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PCT },
-    { "pcx",   TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PCX },
-    { "pl",    TRUE,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "png",   TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PNG },
-    { "rar",   TRUE,  STR_DESCRIPTION_ARCHIVFILE,            0 },
-    { "rtf",   FALSE, STR_DESCRIPTION_WORD_DOC,              IMG_WRITER },
-    { "sbl",   FALSE, 0,                                     0 },
-    { "sch",   FALSE, 0,                                     0 },
-    { "sda",   FALSE, STR_DESCRIPTION_SDRAW_DOC,             IMG_DRAW },
-    { "sdb",   FALSE, STR_DESCRIPTION_SDATABASE_DOC,         IMG_DATABASE },
-    { "sdc",   FALSE, STR_DESCRIPTION_SCALC_DOC,             IMG_CALC },
-    { "sdd",   FALSE, STR_DESCRIPTION_SIMPRESS_DOC,          IMG_IMPRESS },
-    { "sdp",   FALSE, STR_DESCRIPTION_SIMPRESS_DOC,          0 },
-    { "sds",   FALSE, STR_DESCRIPTION_SCHART_DOC,            0 },
-    { "sdw",   FALSE, STR_DESCRIPTION_SWRITER_DOC,           IMG_WRITER },
-    { "sga",   FALSE, 0,                                     0 },
-    { "sgf",   TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_SGF },
-    { "sgl",   FALSE, STR_DESCRIPTION_GLOBALDOC,             IMG_GLOBAL_DOC },
-    { "sgv",   TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_SGV },
-    { "shtml", FALSE, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
-    { "sim",   FALSE, STR_DESCRIPTION_SIMAGE_DOC,            IMG_SIM },
-    { "smf",   FALSE, STR_DESCRIPTION_SMATH_DOC,             IMG_MATH },
-    { "src",   TRUE,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "svh",   FALSE, STR_DESCRIPTION_HELP_DOC,              0 },
-    { "svm",   TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_SVM },
-    { "stc",   FALSE, STR_DESCRIPTION_CALC_TEMPLATE,         IMG_CALCTEMPLATE },
-    { "std",   FALSE, STR_DESCRIPTION_DRAW_TEMPLATE,         IMG_DRAWTEMPLATE },
-    { "sti",   FALSE, STR_DESCRIPTION_IMPRESS_TEMPLATE,      IMG_IMPRESSTEMPLATE },
-    { "stw",   FALSE, STR_DESCRIPTION_WRITER_TEMPLATE,       IMG_WRITERTEMPLATE },
-    { "sxc",   FALSE, STR_DESCRIPTION_SXCALC_DOC,            IMG_CALC },
-    { "sxd",   FALSE, STR_DESCRIPTION_SXDRAW_DOC,            IMG_DRAW },
-    { "sxg",   FALSE, STR_DESCRIPTION_SXGLOBAL_DOC,          IMG_GLOBAL_DOC },
-    { "sxi",   FALSE, STR_DESCRIPTION_SXIMPRESS_DOC,         IMG_IMPRESS },
-    { "sxm",   FALSE, STR_DESCRIPTION_SXMATH_DOC,            IMG_MATH },
-    { "sxs",   FALSE, STR_DESCRIPTION_SXCHART_DOC,           0 },
-    { "sxw",   FALSE, STR_DESCRIPTION_SXWRITER_DOC,          IMG_WRITER },
-    { "sys",   TRUE,  STR_DESCRIPTION_SYSFILE,               0 },
-    { "tif",   TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_TIFF },
-    { "tiff",  TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_TIFF },
-    { "txt",   FALSE, STR_DESCRIPTION_TEXTFILE,              IMG_TEXTFILE },
-    { "url",   FALSE, STR_DESCRIPTION_LINK,                  0 },
-    { "vor",   FALSE, STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC,  IMG_WRITERTEMPLATE },
-    { "vxd",   TRUE,  STR_DESCRIPTION_SYSFILE,               0 },
-    { "wmf",   TRUE,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_WMF },
-    { "xls",   FALSE, STR_DESCRIPTION_EXCEL_DOC,             IMG_CALC },
-    { "xlt",   FALSE, STR_DESCRIPTION_EXCEL_TEMPLATE_DOC,    IMG_CALCTEMPLATE },
-    { "xlsx",  FALSE, STR_DESCRIPTION_EXCEL_DOC,             IMG_CALC },
-    { "uu",    TRUE,  STR_DESCRIPTION_ARCHIVFILE,            0 },
-    { "uue",   TRUE,  STR_DESCRIPTION_ARCHIVFILE,            0 },
-    { "z",     TRUE,  STR_DESCRIPTION_ARCHIVFILE,            0 },
-    { "zip",   TRUE,  STR_DESCRIPTION_ARCHIVFILE,            0 },
-    { "zoo",   TRUE,  STR_DESCRIPTION_ARCHIVFILE,            0 },
-    { "gz",    TRUE,  STR_DESCRIPTION_ARCHIVFILE,            0 },
-    { "ppt",   FALSE, STR_DESCRIPTION_POWERPOINT,            IMG_IMPRESS },
-    { "pot",   FALSE, STR_DESCRIPTION_POWERPOINT_TEMPLATE,   IMG_IMPRESSTEMPLATE },
-    { "pps",   FALSE, STR_DESCRIPTION_POWERPOINT_SHOW,       IMG_IMPRESS },
-    { "pptx",  FALSE, STR_DESCRIPTION_POWERPOINT,            IMG_IMPRESS },
-    { "oxt",   FALSE, STR_DESCRIPTION_EXTENSION,             IMG_EXTENSION },
-    { 0, FALSE, 0, 0 }
+    { "log",   sal_True,  STR_DESCRIPTION_LOGFILE,               0 },
+    { "lst",   sal_True,  STR_DESCRIPTION_LOGFILE,               0 },
+    { "met",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_MET },
+    { "mml",   sal_False, STR_DESCRIPTION_MATHML_DOC,            IMG_MATH },
+    { "mod",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "odb",   sal_False, STR_DESCRIPTION_OO_DATABASE_DOC,       IMG_OO_DATABASE_DOC },
+    { "odg",   sal_False, STR_DESCRIPTION_OO_DRAW_DOC,           IMG_OO_DRAW_DOC },
+    { "odf",   sal_False, STR_DESCRIPTION_OO_MATH_DOC,           IMG_OO_MATH_DOC },
+    { "odm",   sal_False, STR_DESCRIPTION_OO_GLOBAL_DOC,         IMG_OO_GLOBAL_DOC },
+    { "odp",   sal_False, STR_DESCRIPTION_OO_IMPRESS_DOC,        IMG_OO_IMPRESS_DOC },
+    { "ods",   sal_False, STR_DESCRIPTION_OO_CALC_DOC,           IMG_OO_CALC_DOC },
+    { "odt",   sal_False, STR_DESCRIPTION_OO_WRITER_DOC,         IMG_OO_WRITER_DOC },
+    { "otg",   sal_False, STR_DESCRIPTION_OO_DRAW_TEMPLATE,      IMG_OO_DRAW_TEMPLATE },
+    { "otp",   sal_False, STR_DESCRIPTION_OO_IMPRESS_TEMPLATE,   IMG_OO_IMPRESS_TEMPLATE },
+    { "ots",   sal_False, STR_DESCRIPTION_OO_CALC_TEMPLATE,      IMG_OO_CALC_TEMPLATE },
+    { "ott",   sal_False, STR_DESCRIPTION_OO_WRITER_TEMPLATE,    IMG_OO_WRITER_TEMPLATE },
+    { "pas",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "pcd",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PCD },
+    { "pct",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PCT },
+    { "pcx",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PCX },
+    { "pl",    sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "png",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PNG },
+    { "rar",   sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "rtf",   sal_False, STR_DESCRIPTION_WORD_DOC,              IMG_WRITER },
+    { "sbl",   sal_False, 0,                                     0 },
+    { "sch",   sal_False, 0,                                     0 },
+    { "sda",   sal_False, STR_DESCRIPTION_SDRAW_DOC,             IMG_DRAW },
+    { "sdb",   sal_False, STR_DESCRIPTION_SDATABASE_DOC,         IMG_DATABASE },
+    { "sdc",   sal_False, STR_DESCRIPTION_SCALC_DOC,             IMG_CALC },
+    { "sdd",   sal_False, STR_DESCRIPTION_SIMPRESS_DOC,          IMG_IMPRESS },
+    { "sdp",   sal_False, STR_DESCRIPTION_SIMPRESS_DOC,          0 },
+    { "sds",   sal_False, STR_DESCRIPTION_SCHART_DOC,            0 },
+    { "sdw",   sal_False, STR_DESCRIPTION_SWRITER_DOC,           IMG_WRITER },
+    { "sga",   sal_False, 0,                                     0 },
+    { "sgf",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_SGF },
+    { "sgl",   sal_False, STR_DESCRIPTION_GLOBALDOC,             IMG_GLOBAL_DOC },
+    { "sgv",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_SGV },
+    { "shtml", sal_False, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
+    { "sim",   sal_False, STR_DESCRIPTION_SIMAGE_DOC,            IMG_SIM },
+    { "smf",   sal_False, STR_DESCRIPTION_SMATH_DOC,             IMG_MATH },
+    { "src",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "svh",   sal_False, STR_DESCRIPTION_HELP_DOC,              0 },
+    { "svm",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_SVM },
+    { "stc",   sal_False, STR_DESCRIPTION_CALC_TEMPLATE,         IMG_CALCTEMPLATE },
+    { "std",   sal_False, STR_DESCRIPTION_DRAW_TEMPLATE,         IMG_DRAWTEMPLATE },
+    { "sti",   sal_False, STR_DESCRIPTION_IMPRESS_TEMPLATE,      IMG_IMPRESSTEMPLATE },
+    { "stw",   sal_False, STR_DESCRIPTION_WRITER_TEMPLATE,       IMG_WRITERTEMPLATE },
+    { "sxc",   sal_False, STR_DESCRIPTION_SXCALC_DOC,            IMG_CALC },
+    { "sxd",   sal_False, STR_DESCRIPTION_SXDRAW_DOC,            IMG_DRAW },
+    { "sxg",   sal_False, STR_DESCRIPTION_SXGLOBAL_DOC,          IMG_GLOBAL_DOC },
+    { "sxi",   sal_False, STR_DESCRIPTION_SXIMPRESS_DOC,         IMG_IMPRESS },
+    { "sxm",   sal_False, STR_DESCRIPTION_SXMATH_DOC,            IMG_MATH },
+    { "sxs",   sal_False, STR_DESCRIPTION_SXCHART_DOC,           0 },
+    { "sxw",   sal_False, STR_DESCRIPTION_SXWRITER_DOC,          IMG_WRITER },
+    { "sys",   sal_True,  STR_DESCRIPTION_SYSFILE,               0 },
+    { "tif",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_TIFF },
+    { "tiff",  sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_TIFF },
+    { "txt",   sal_False, STR_DESCRIPTION_TEXTFILE,              IMG_TEXTFILE },
+    { "url",   sal_False, STR_DESCRIPTION_LINK,                  0 },
+    { "vor",   sal_False, STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC,  IMG_WRITERTEMPLATE },
+    { "vxd",   sal_True,  STR_DESCRIPTION_SYSFILE,               0 },
+    { "wmf",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_WMF },
+    { "xls",   sal_False, STR_DESCRIPTION_EXCEL_DOC,             IMG_CALC },
+    { "xlt",   sal_False, STR_DESCRIPTION_EXCEL_TEMPLATE_DOC,    IMG_CALCTEMPLATE },
+    { "xlsx",  sal_False, STR_DESCRIPTION_EXCEL_DOC,             IMG_CALC },
+    { "uu",    sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "uue",   sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "z",     sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "zip",   sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "zoo",   sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "gz",    sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "ppt",   sal_False, STR_DESCRIPTION_POWERPOINT,            IMG_IMPRESS },
+    { "pot",   sal_False, STR_DESCRIPTION_POWERPOINT_TEMPLATE,   IMG_IMPRESSTEMPLATE },
+    { "pps",   sal_False, STR_DESCRIPTION_POWERPOINT_SHOW,       IMG_IMPRESS },
+    { "pptx",  sal_False, STR_DESCRIPTION_POWERPOINT,            IMG_IMPRESS },
+    { "oxt",   sal_False, STR_DESCRIPTION_EXTENSION,             IMG_EXTENSION },
+    { 0, sal_False, 0, 0 }
 };
 
 #ifdef OS2
     SvtExtensionResIdMapping_Impl Mappings[] =
     {
-    {"StarWriter 4.0",         FALSE,STR_DESCRIPTION_SWRITER_DOC, IMG_WRITER},
-    {"StarWriter 3.0",         FALSE,STR_DESCRIPTION_SWRITER_DOC, IMG_WRITER},
-    {"StarCalc 4.0",           FALSE,STR_DESCRIPTION_SCALC_DOC,   IMG_CALC},
-    {"StarCalc 3.0",           FALSE,STR_DESCRIPTION_SCALC_DOC,   IMG_CALC},
-    {"StarImpress 4.0",        FALSE,STR_DESCRIPTION_SIMPRESS_DOC,IMG_IMPRESS},
-    {"StarDraw 4.0",           FALSE,STR_DESCRIPTION_SDRAW_DOC,   IMG_DRAW},
-    {"StarDraw 3.0",           FALSE,STR_DESCRIPTION_SDRAW_DOC,   IMG_DRAW},
-    {"StarChart 3.0",          FALSE,STR_DESCRIPTION_SCHART_DOC,  IMG_CHART},
-    {"StarChart 4.0",          FALSE,STR_DESCRIPTION_SCHART_DOC,  IMG_CHART},
-    {"Bitmap",                 FALSE,STR_DESCRIPTION_GRAPHIC_DOC, IMG_BITMAP},
-    {"AutoCAD",                FALSE,STR_DESCRIPTION_GRAPHIC_DOC, IMG_SIM},
-    {"Gif-File",               FALSE,STR_DESCRIPTION_GRAPHIC_DOC, IMG_GIF},
-    {"JPEG-File",              FALSE,STR_DESCRIPTION_GRAPHIC_DOC, IMG_JPG},
-    {"Metafile ",              FALSE,STR_DESCRIPTION_GRAPHIC_DOC, IMG_SIM},
-    {"Photo-CD ",              FALSE,STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCD},
-    {"Mac Pict",               FALSE,STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCT},
-    {"PCX-File ",              FALSE,STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCX},
-    {"PNG-File",               FALSE,STR_DESCRIPTION_GRAPHIC_DOC, IMG_SIM},
-    {"SV-Metafile",            FALSE,STR_DESCRIPTION_GRAPHIC_DOC, IMG_SIM},
-    {"TIFF-File",              FALSE,STR_DESCRIPTION_GRAPHIC_DOC, IMG_TIFF},
-    {"MS-Metafile",            FALSE,STR_DESCRIPTION_GRAPHIC_DOC, IMG_WMF},
-    {"XBM-File",               FALSE,STR_DESCRIPTION_GRAPHIC_DOC, IMG_BITMAP},
+    {"StarWriter 4.0",         sal_False,STR_DESCRIPTION_SWRITER_DOC, IMG_WRITER},
+    {"StarWriter 3.0",         sal_False,STR_DESCRIPTION_SWRITER_DOC, IMG_WRITER},
+    {"StarCalc 4.0",           sal_False,STR_DESCRIPTION_SCALC_DOC,   IMG_CALC},
+    {"StarCalc 3.0",           sal_False,STR_DESCRIPTION_SCALC_DOC,   IMG_CALC},
+    {"StarImpress 4.0",        sal_False,STR_DESCRIPTION_SIMPRESS_DOC,IMG_IMPRESS},
+    {"StarDraw 4.0",           sal_False,STR_DESCRIPTION_SDRAW_DOC,   IMG_DRAW},
+    {"StarDraw 3.0",           sal_False,STR_DESCRIPTION_SDRAW_DOC,   IMG_DRAW},
+    {"StarChart 3.0",          sal_False,STR_DESCRIPTION_SCHART_DOC,  IMG_CHART},
+    {"StarChart 4.0",          sal_False,STR_DESCRIPTION_SCHART_DOC,  IMG_CHART},
+    {"Bitmap",                 sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_BITMAP},
+    {"AutoCAD",                sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_SIM},
+    {"Gif-File",               sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_GIF},
+    {"JPEG-File",              sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_JPG},
+    {"Metafile ",              sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_SIM},
+    {"Photo-CD ",              sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCD},
+    {"Mac Pict",               sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCT},
+    {"PCX-File ",              sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCX},
+    {"PNG-File",               sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_SIM},
+    {"SV-Metafile",            sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_SIM},
+    {"TIFF-File",              sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_TIFF},
+    {"MS-Metafile",            sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_WMF},
+    {"XBM-File",               sal_False,STR_DESCRIPTION_GRAPHIC_DOC, IMG_BITMAP},
     {NULL, 0}
     };
 #endif
@@ -246,7 +245,7 @@ static String GetImageExtensionByFactory_Impl( const String& rURL )
 
     if ( aPath.Len() )
     {
-        USHORT nIndex = 0;
+        sal_uInt16 nIndex = 0;
         while ( Fac2ExtMap_Impl[ nIndex ]._pFactory )
         {
             if ( aPath.EqualsAscii( Fac2ExtMap_Impl[ nIndex ]._pFactory ) )
@@ -304,12 +303,12 @@ static String GetImageExtensionByFactory_Impl( const String& rURL )
     return aExtension;
 }
 
-static USHORT GetIndexOfExtension_Impl( const String& rExtension )
+static sal_uInt16 GetIndexOfExtension_Impl( const String& rExtension )
 {
-    USHORT nRet = NO_INDEX;
+    sal_uInt16 nRet = NO_INDEX;
     if ( rExtension.Len() )
     {
-        USHORT nIndex = 0;
+        sal_uInt16 nIndex = 0;
         String aExt = rExtension;
         aExt.ToLowerAscii();
         while ( ExtensionMap_Impl[ nIndex ]._pExt )
@@ -326,12 +325,12 @@ static USHORT GetIndexOfExtension_Impl( const String& rExtension )
     return nRet;
 }
 
-static USHORT GetImageId_Impl( const String& rExtension )
+static sal_uInt16 GetImageId_Impl( const String& rExtension )
 {
-    USHORT nImage = IMG_FILE;
+    sal_uInt16 nImage = IMG_FILE;
     if ( rExtension.Len()  != NO_INDEX )
     {
-        USHORT nIndex = GetIndexOfExtension_Impl( rExtension );
+        sal_uInt16 nIndex = GetIndexOfExtension_Impl( rExtension );
         if ( nIndex != NO_INDEX )
         {
             nImage = ExtensionMap_Impl[ nIndex ]._nImgId;
@@ -367,9 +366,9 @@ static sal_Bool GetVolumeProperties_Impl( ::ucbhelper::Content& rContent, svtool
     return bRet;
 }
 
-static USHORT GetFolderImageId_Impl( const String& rURL )
+static sal_uInt16 GetFolderImageId_Impl( const String& rURL )
 {
-    USHORT nRet = IMG_FOLDER;
+    sal_uInt16 nRet = IMG_FOLDER;
     ::svtools::VolumeInfo aVolumeInfo;
     try
     {
@@ -397,12 +396,12 @@ static USHORT GetFolderImageId_Impl( const String& rURL )
     return nRet;
 }
 
-static USHORT GetImageId_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder )
+static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, "svtools", "hb93813", "SvFileInformationManager::GetImageId_Impl()" );
 
     String aExt, sURL = rObject.GetMainURL( INetURLObject::NO_DECODE );
-    USHORT nImage = IMG_FILE;
+    sal_uInt16 nImage = IMG_FILE;
 
     if ( rObject.GetProtocol() == INET_PROT_PRIVATE )
     {
@@ -417,7 +416,7 @@ static USHORT GetImageId_Impl( const INetURLObject& rObject, sal_Bool bDetectFol
             return nImage;
         }
         else if ( aType == String( RTL_CONSTASCII_USTRINGPARAM("image") ) )
-            nImage = (USHORT)aURLPath.GetToken( 1, INET_PATH_TOKEN ).ToInt32();
+            nImage = (sal_uInt16)aURLPath.GetToken( 1, INET_PATH_TOKEN ).ToInt32();
     }
     else
     {
@@ -425,7 +424,7 @@ static USHORT GetImageId_Impl( const INetURLObject& rObject, sal_Bool bDetectFol
         if ( aExt.EqualsAscii( "vor" ) )
         {
             SotStorageRef aStorage = new SotStorage( sURL, STREAM_STD_READ );
-            USHORT nId = IMG_WRITERTEMPLATE;
+            sal_uInt16 nId = IMG_WRITERTEMPLATE;
             if ( !aStorage->GetError() )
             {
                 SvGlobalName aGlobalName = aStorage->GetClassName();
@@ -454,13 +453,13 @@ static USHORT GetImageId_Impl( const INetURLObject& rObject, sal_Bool bDetectFol
     return nImage;
 }
 
-static USHORT GetDescriptionId_Impl( const String& rExtension, sal_Bool& rbShowExt )
+static sal_uInt16 GetDescriptionId_Impl( const String& rExtension, sal_Bool& rbShowExt )
 {
-    USHORT nId = 0;
+    sal_uInt16 nId = 0;
 
     if ( rExtension.Len()  != NO_INDEX )
     {
-        USHORT nIndex = GetIndexOfExtension_Impl( rExtension );
+        sal_uInt16 nIndex = GetIndexOfExtension_Impl( rExtension );
         if ( nIndex != NO_INDEX )
         {
             nId = ExtensionMap_Impl[ nIndex ]._nStrId;
@@ -473,7 +472,7 @@ static USHORT GetDescriptionId_Impl( const String& rExtension, sal_Bool& rbShowE
 
 static String GetDescriptionByFactory_Impl( const String& rFactory )
 {
-    USHORT nResId = 0;
+    sal_uInt16 nResId = 0;
     if ( rFactory.EqualsIgnoreCaseAscii( "swriter", 0, 7 ) )
         nResId = STR_DESCRIPTION_FACTORY_WRITER;
     else if ( rFactory.EqualsIgnoreCaseAscii( "scalc", 0, 5 ) )
@@ -500,9 +499,9 @@ static String GetDescriptionByFactory_Impl( const String& rFactory )
     return aRet;
 }
 
-static USHORT GetFolderDescriptionId_Impl( const String& rURL )
+static sal_uInt16 GetFolderDescriptionId_Impl( const String& rURL )
 {
-    USHORT nRet = STR_DESCRIPTION_FOLDER;
+    sal_uInt16 nRet = STR_DESCRIPTION_FOLDER;
     svtools::VolumeInfo aVolumeInfo;
     try
     {
@@ -530,6 +529,7 @@ static USHORT GetFolderDescriptionId_Impl( const String& rURL )
     return nRet;
 }
 
+/*
 static ResMgr* GetIsoResMgr_Impl()
 {
     static ResMgr* pIsoResMgr = NULL;
@@ -551,7 +551,7 @@ static ResMgr* GetIsoResMgr_Impl()
     return pIsoResMgr;
 }
 
-static ImageList* CreateImageList_Impl( USHORT nResId )
+static ImageList* CreateImageList_Impl( sal_uInt16 nResId )
 {
     ImageList* pList = NULL;
     ResMgr* pResMgr = GetIsoResMgr_Impl();
@@ -565,13 +565,13 @@ static ImageList* CreateImageList_Impl( USHORT nResId )
     return pList;
 }
 
-static Image GetOfficeImageFromList_Impl( USHORT nImageId, BOOL bBig )
+static Image GetOfficeImageFromList_Impl( sal_uInt16 nImageId, sal_Bool bBig )
 {
     ImageList* pList = NULL;
 
     static ImageList* _pSmallOfficeImgList = NULL;
     static ImageList* _pBigOfficeImgList = NULL;
-    static ULONG nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
+    static sal_uLong nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
 
     // If the style has been changed, throw away our cache of the older images
     if ( nStyle != Application::GetSettings().GetStyleSettings().GetSymbolsStyle() )
@@ -598,8 +598,9 @@ static Image GetOfficeImageFromList_Impl( USHORT nImageId, BOOL bBig )
 
     return aImage;
 }
+*/
 
-static Image GetImageFromList_Impl( USHORT nImageId, BOOL bBig )
+static Image GetImageFromList_Impl( sal_uInt16 nImageId, sal_Bool bBig )
 {
     if ( !bBig && IMG_FOLDER == nImageId )
         // return our new small folder image (256 colors)
@@ -609,7 +610,7 @@ static Image GetImageFromList_Impl( USHORT nImageId, BOOL bBig )
 
     static ImageList* _pSmallImageList = NULL;
     static ImageList* _pBigImageList = NULL;
-    static ULONG nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
+    static sal_uLong nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
 
     // If the style has been changed, throw away our cache of the older images
     if ( nStyle != Application::GetSettings().GetStyleSettings().GetSymbolsStyle() )
@@ -644,7 +645,7 @@ String SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObje
 
     String sDescription;
     String sExtension( rObject.getExtension() ), sURL( rObject.GetMainURL( INetURLObject::NO_DECODE ) );
-    USHORT nResId = 0;
+    sal_uInt16 nResId = 0;
     sal_Bool bShowExt = sal_False, bDetected = sal_False, bOnlyFile = sal_False;
     sal_Bool bFolder = bDetectFolder ? CONTENT_HELPER::IsFolder( sURL ) : sal_False;
     if ( !bFolder )
@@ -709,21 +710,21 @@ String SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObje
 
 Image SvFileInformationManager::GetImage( const INetURLObject& rObject, sal_Bool bBig )
 {
-    USHORT nImage = GetImageId_Impl( rObject, sal_True );
+    sal_uInt16 nImage = GetImageId_Impl( rObject, sal_True );
     DBG_ASSERT( nImage, "invalid ImageId" );
     return GetImageFromList_Impl( nImage, bBig );
 }
 
 Image SvFileInformationManager::GetFileImage( const INetURLObject& rObject, sal_Bool bBig )
 {
-    USHORT nImage = GetImageId_Impl( rObject, sal_False );
+    sal_Int16 nImage = GetImageId_Impl( rObject, sal_False );
     DBG_ASSERT( nImage, "invalid ImageId" );
     return GetImageFromList_Impl( nImage, bBig );
 }
 
 Image SvFileInformationManager::GetImageNoDefault( const INetURLObject& rObject, sal_Bool bBig )
 {
-    USHORT nImage = GetImageId_Impl( rObject, sal_True );
+    sal_uInt16 nImage = GetImageId_Impl( rObject, sal_True );
     DBG_ASSERT( nImage, "invalid ImageId" );
 
     if ( nImage == IMG_FILE )
@@ -734,7 +735,7 @@ Image SvFileInformationManager::GetImageNoDefault( const INetURLObject& rObject,
 
 Image SvFileInformationManager::GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig )
 {
-    USHORT nImage = IMG_FOLDER;
+    sal_uInt16 nImage = IMG_FOLDER;
     DBG_ASSERT( nImage, "invalid ImageId" );
 
     if ( rInfo.m_bIsRemote )
@@ -761,7 +762,7 @@ String SvFileInformationManager::GetFileDescription( const INetURLObject& rObjec
 
 String SvFileInformationManager::GetFolderDescription( const svtools::VolumeInfo& rInfo )
 {
-    USHORT nResId = STR_DESCRIPTION_FOLDER;
+    sal_uInt16 nResId = STR_DESCRIPTION_FOLDER;
     if ( rInfo.m_bIsRemote )
         nResId = STR_DESCRIPTION_REMOTE_VOLUME;
     else if ( rInfo.m_bIsFloppy )
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index c49f048364e4..62104ea09d54 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -27,11 +27,26 @@
  // includes ******************************************************************
 
 #include <svtools/svtools.hrc>
-#include "imagemgr.hrc"
+#include <svtools/imagemgr.hrc>
 
  // images ********************************************************************
 
 #define X_IMAGE_LIST \
+    IMG_IMPRESS ;           \
+    IMG_CALC ;              \
+    IMG_CALCTEMPLATE ;      \
+    IMG_CHART ;             \
+    IMG_IMPRESSTEMPLATE ;   \
+    IMG_HTML ;              \
+    IMG_MATH ;              \
+    IMG_WRITER ;            \
+    IMG_WRITERTEMPLATE ;    \
+    IMG_MACROLIB ;          \
+    IMG_GLOBAL_DOC ;        \
+    IMG_DRAW ;              \
+    IMG_DRAWTEMPLATE ;      \
+    IMG_NEWFROMTEMPLATE ;   \
+    IMG_DATABASE;           \
     IMG_BITMAP ; \
     IMG_CALC ; \
     IMG_CALCTEMPLATE ; \
@@ -95,7 +110,7 @@ ImageList RID_SVTOOLS_IMAGELIST_BIG
     };
     IdCount =
     {
-        51 ;
+        66 ;
     };
 };
 
@@ -109,7 +124,7 @@ ImageList RID_SVTOOLS_IMAGELIST_SMALL
     };
     IdCount =
     {
-        51;
+        66;
     };
 };
 
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index 47a68a5684ea..e69f1967b462 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include "imageresourceaccess.hxx"
+#include <svtools/imageresourceaccess.hxx>
 
 /** === begin UNO includes === **/
 #include <com/sun/star/io/NotConnectedException.hpp>
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 105eb763fb7b..88bb9a9a510a 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -53,15 +53,11 @@ DBG_NAME( ImageMap )
 
 /******************************************************************************/
 
-UINT16 IMapObject::nActualTextEncoding = (UINT16) RTL_TEXTENCODING_DONTKNOW;
+sal_uInt16 IMapObject::nActualTextEncoding = (sal_uInt16) RTL_TEXTENCODING_DONTKNOW;
 
 /******************************************************************************/
 
 
-#ifdef WIN
-#pragma optimize ( "", off )
-#endif
-
 IMapObject::IMapObject()
     : bActive( false )
     , nReadVersion( 0 )
@@ -69,7 +65,7 @@ IMapObject::IMapObject()
 }
 
 IMapObject::IMapObject( const String& rURL, const String& rAltText, const String& rDesc,
-                        const String& rTarget, const String& rName, BOOL bURLActive )
+                        const String& rTarget, const String& rName, sal_Bool bURLActive )
 : aURL( rURL )
 , aAltText( rAltText )
 , aDesc( rDesc )
@@ -87,7 +83,7 @@ IMapObject::IMapObject( const String& rURL, const String& rAltText, const String
 |*
 \******************************************************************************/
 
-UINT16 IMapObject::GetVersion() const
+sal_uInt16 IMapObject::GetVersion() const
 {
     return IMAP_OBJ_VERSION;
 }
@@ -106,7 +102,7 @@ void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const
 
     rOStm << GetType();
     rOStm << GetVersion();
-    rOStm << ( (UINT16) eEncoding );
+    rOStm << ( (sal_uInt16) eEncoding );
 
     const ByteString aRelURL = ByteString( String(URIHelper::simpleNormalizedMakeRelative( rBaseURL, aURL )), eEncoding );
     rOStm.WriteByteString( aRelURL );
@@ -197,7 +193,7 @@ Point IMapObject::GetLogPoint( const Point& rPixelPoint )
 |*
 \******************************************************************************/
 
-BOOL IMapObject::IsEqual( const IMapObject& rEqObj )
+sal_Bool IMapObject::IsEqual( const IMapObject& rEqObj )
 {
     return ( ( aURL == rEqObj.aURL ) &&
              ( aAltText == rEqObj.aAltText ) &&
@@ -218,8 +214,8 @@ IMapRectangleObject::IMapRectangleObject( const Rectangle& rRect,
                                           const String& rDesc,
                                           const String& rTarget,
                                           const String& rName,
-                                          BOOL bURLActive,
-                                          BOOL bPixelCoords ) :
+                                          sal_Bool bURLActive,
+                                          sal_Bool bPixelCoords ) :
             IMapObject  ( rURL, rAltText, rDesc, rTarget, rName, bURLActive )
 {
     ImpConstruct( rRect, bPixelCoords );
@@ -232,7 +228,7 @@ IMapRectangleObject::IMapRectangleObject( const Rectangle& rRect,
 |*
 \******************************************************************************/
 
-void IMapRectangleObject::ImpConstruct( const Rectangle& rRect, BOOL bPixel )
+void IMapRectangleObject::ImpConstruct( const Rectangle& rRect, sal_Bool bPixel )
 {
     if ( bPixel )
         aRect = Application::GetDefaultDevice()->PixelToLogic( rRect, MapMode( MAP_100TH_MM ) );
@@ -271,7 +267,7 @@ void IMapRectangleObject::ReadIMapObject( SvStream& rIStm )
 |*
 \******************************************************************************/
 
-UINT16 IMapRectangleObject::GetType() const
+sal_uInt16 IMapRectangleObject::GetType() const
 {
     return IMAP_OBJ_RECTANGLE;
 }
@@ -283,7 +279,7 @@ UINT16 IMapRectangleObject::GetType() const
 |*
 \******************************************************************************/
 
-BOOL IMapRectangleObject::IsHit( const Point& rPoint ) const
+sal_Bool IMapRectangleObject::IsHit( const Point& rPoint ) const
 {
     return aRect.IsInside( rPoint );
 }
@@ -295,7 +291,7 @@ BOOL IMapRectangleObject::IsHit( const Point& rPoint ) const
 |*
 \******************************************************************************/
 
-Rectangle IMapRectangleObject::GetRectangle( BOOL bPixelCoords ) const
+Rectangle IMapRectangleObject::GetRectangle( sal_Bool bPixelCoords ) const
 {
     Rectangle   aNewRect;
 
@@ -335,7 +331,7 @@ void IMapRectangleObject::Scale( const Fraction& rFracX, const Fraction& rFracY
 |*
 \******************************************************************************/
 
-BOOL IMapRectangleObject::IsEqual( const IMapRectangleObject& rEqObj )
+sal_Bool IMapRectangleObject::IsEqual( const IMapRectangleObject& rEqObj )
 {
     return ( IMapObject::IsEqual( rEqObj ) && ( aRect == rEqObj.aRect ) );
 }
@@ -345,14 +341,14 @@ BOOL IMapRectangleObject::IsEqual( const IMapRectangleObject& rEqObj )
 /******************************************************************************/
 /******************************************************************************/
 
-IMapCircleObject::IMapCircleObject( const Point& rCenter, ULONG nCircleRadius,
+IMapCircleObject::IMapCircleObject( const Point& rCenter, sal_uLong nCircleRadius,
                                     const String& rURL,
                                     const String& rAltText,
                                     const String& rDesc,
                                     const String& rTarget,
                                     const String& rName,
-                                    BOOL bURLActive,
-                                    BOOL bPixelCoords ) :
+                                    sal_Bool bURLActive,
+                                    sal_Bool bPixelCoords ) :
             IMapObject  ( rURL, rAltText, rDesc, rTarget, rName, bURLActive )
 {
     ImpConstruct( rCenter, nCircleRadius, bPixelCoords );
@@ -365,7 +361,7 @@ IMapCircleObject::IMapCircleObject( const Point& rCenter, ULONG nCircleRadius,
 |*
 \******************************************************************************/
 
-void IMapCircleObject::ImpConstruct( const Point& rCenter, ULONG nRad, BOOL bPixel )
+void IMapCircleObject::ImpConstruct( const Point& rCenter, sal_uLong nRad, sal_Bool bPixel )
 {
     if ( bPixel )
     {
@@ -390,7 +386,7 @@ void IMapCircleObject::ImpConstruct( const Point& rCenter, ULONG nRad, BOOL bPix
 
 void IMapCircleObject::WriteIMapObject( SvStream& rOStm ) const
 {
-    UINT32 nTmp = nRadius;
+    sal_uInt32 nTmp = nRadius;
 
     rOStm << aCenter;
     rOStm << nTmp;
@@ -405,7 +401,7 @@ void IMapCircleObject::WriteIMapObject( SvStream& rOStm ) const
 
 void IMapCircleObject::ReadIMapObject( SvStream& rIStm )
 {
-    UINT32 nTmp;
+    sal_uInt32 nTmp;
 
     rIStm >> aCenter;
     rIStm >> nTmp;
@@ -420,7 +416,7 @@ void IMapCircleObject::ReadIMapObject( SvStream& rIStm )
 |*
 \******************************************************************************/
 
-UINT16 IMapCircleObject::GetType() const
+sal_uInt16 IMapCircleObject::GetType() const
 {
     return IMAP_OBJ_CIRCLE;
 }
@@ -432,15 +428,15 @@ UINT16 IMapCircleObject::GetType() const
 |*
 \******************************************************************************/
 
-BOOL IMapCircleObject::IsHit( const Point& rPoint ) const
+sal_Bool IMapCircleObject::IsHit( const Point& rPoint ) const
 {
     const Point aPoint( aCenter - rPoint );
-    BOOL        bRet = FALSE;
+    sal_Bool        bRet = sal_False;
 
-    if ( (ULONG) sqrt( (double) aPoint.X() * aPoint.X() +
+    if ( (sal_uLong) sqrt( (double) aPoint.X() * aPoint.X() +
                        aPoint.Y() * aPoint.Y() ) <= nRadius )
     {
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -453,7 +449,7 @@ BOOL IMapCircleObject::IsHit( const Point& rPoint ) const
 |*
 \******************************************************************************/
 
-Point IMapCircleObject::GetCenter( BOOL bPixelCoords ) const
+Point IMapCircleObject::GetCenter( sal_Bool bPixelCoords ) const
 {
     Point aNewPoint;
 
@@ -472,9 +468,9 @@ Point IMapCircleObject::GetCenter( BOOL bPixelCoords ) const
 |*
 \******************************************************************************/
 
-ULONG IMapCircleObject::GetRadius( BOOL bPixelCoords ) const
+sal_uLong IMapCircleObject::GetRadius( sal_Bool bPixelCoords ) const
 {
-    ULONG nNewRadius;
+    sal_uLong nNewRadius;
 
     if ( bPixelCoords )
         nNewRadius = Application::GetDefaultDevice()->LogicToPixel( Size( nRadius, 0 ), MapMode( MAP_100TH_MM ) ).Width();
@@ -528,7 +524,7 @@ void IMapCircleObject::Scale( const Fraction& rFracX, const Fraction& rFracY )
 |*
 \******************************************************************************/
 
-BOOL IMapCircleObject::IsEqual( const IMapCircleObject& rEqObj )
+sal_Bool IMapCircleObject::IsEqual( const IMapCircleObject& rEqObj )
 {
     return ( IMapObject::IsEqual( rEqObj ) &&
              ( aCenter == rEqObj.aCenter ) &&
@@ -545,10 +541,10 @@ IMapPolygonObject::IMapPolygonObject( const Polygon& rPoly,
                                       const String& rDesc,
                                       const String& rTarget,
                                       const String& rName,
-                                      BOOL bURLActive,
-                                      BOOL bPixelCoords ) :
+                                      sal_Bool bURLActive,
+                                      sal_Bool bPixelCoords ) :
             IMapObject  ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ),
-            bEllipse    ( FALSE )
+            bEllipse    ( sal_False )
 {
     ImpConstruct( rPoly, bPixelCoords );
 }
@@ -560,7 +556,7 @@ IMapPolygonObject::IMapPolygonObject( const Polygon& rPoly,
 |*
 \******************************************************************************/
 
-void IMapPolygonObject::ImpConstruct( const Polygon& rPoly, BOOL bPixel )
+void IMapPolygonObject::ImpConstruct( const Polygon& rPoly, sal_Bool bPixel )
 {
     if ( bPixel )
         aPoly = Application::GetDefaultDevice()->PixelToLogic( rPoly, MapMode( MAP_100TH_MM ) );
@@ -608,7 +604,7 @@ void IMapPolygonObject::ReadIMapObject( SvStream& rIStm )
 |*
 \******************************************************************************/
 
-UINT16 IMapPolygonObject::GetType() const
+sal_uInt16 IMapPolygonObject::GetType() const
 {
     return IMAP_OBJ_POLYGON;
 }
@@ -620,7 +616,7 @@ UINT16 IMapPolygonObject::GetType() const
 |*
 \******************************************************************************/
 
-BOOL IMapPolygonObject::IsHit( const Point& rPoint ) const
+sal_Bool IMapPolygonObject::IsHit( const Point& rPoint ) const
 {
     return aPoly.IsInside( rPoint );
 }
@@ -632,7 +628,7 @@ BOOL IMapPolygonObject::IsHit( const Point& rPoint ) const
 |*
 \******************************************************************************/
 
-Polygon IMapPolygonObject::GetPolygon( BOOL bPixelCoords ) const
+Polygon IMapPolygonObject::GetPolygon( sal_Bool bPixelCoords ) const
 {
     Polygon aNewPoly;
 
@@ -655,7 +651,7 @@ void IMapPolygonObject::SetExtraEllipse( const Rectangle& rEllipse )
 {
     if ( aPoly.GetSize() )
     {
-        bEllipse = TRUE;
+        bEllipse = sal_True;
         aEllipse = rEllipse;
     }
 }
@@ -669,9 +665,9 @@ void IMapPolygonObject::SetExtraEllipse( const Rectangle& rEllipse )
 
 void IMapPolygonObject::Scale( const Fraction& rFracX, const Fraction& rFracY )
 {
-    USHORT nCount = aPoly.GetSize();
+    sal_uInt16 nCount = aPoly.GetSize();
 
-    for ( USHORT i = 0; i < nCount; i++ )
+    for ( sal_uInt16 i = 0; i < nCount; i++ )
     {
         Point aScaledPt( aPoly[ i ] );
 
@@ -705,30 +701,30 @@ void IMapPolygonObject::Scale( const Fraction& rFracX, const Fraction& rFracY )
 |*
 \******************************************************************************/
 
-BOOL IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj )
+sal_Bool IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if ( IMapObject::IsEqual( rEqObj ) )
     {
         const Polygon&  rEqPoly = rEqObj.aPoly;
-        const USHORT    nCount = aPoly.GetSize();
-        const USHORT    nEqCount = rEqPoly.GetSize();
-        BOOL            bDifferent = FALSE;
+        const sal_uInt16    nCount = aPoly.GetSize();
+        const sal_uInt16    nEqCount = rEqPoly.GetSize();
+        sal_Bool            bDifferent = sal_False;
 
         if ( nCount == nEqCount )
         {
-            for ( USHORT i = 0; i < nCount; i++ )
+            for ( sal_uInt16 i = 0; i < nCount; i++ )
             {
                 if ( aPoly[ i ] != rEqPoly[ i ] )
                 {
-                    bDifferent = TRUE;
+                    bDifferent = sal_True;
                     break;
                 }
             }
 
             if ( !bDifferent )
-                bRet = TRUE;
+                bRet = sal_True;
         }
     }
 
@@ -763,9 +759,9 @@ ImageMap::ImageMap( const ImageMap& rImageMap )
 {
     DBG_CTOR( ImageMap, NULL );
 
-    USHORT nCount = rImageMap.GetIMapObjectCount();
+    sal_uInt16 nCount = rImageMap.GetIMapObjectCount();
 
-    for ( USHORT i = 0; i < nCount; i++ )
+    for ( sal_uInt16 i = 0; i < nCount; i++ )
     {
         IMapObject* pCopyObj = rImageMap.GetIMapObject( i );
 
@@ -836,11 +832,11 @@ void ImageMap::ClearImageMap()
 
 ImageMap& ImageMap::operator=( const ImageMap& rImageMap )
 {
-    USHORT nCount = rImageMap.GetIMapObjectCount();
+    sal_uInt16 nCount = rImageMap.GetIMapObjectCount();
 
     ClearImageMap();
 
-    for ( USHORT i = 0; i < nCount; i++ )
+    for ( sal_uInt16 i = 0; i < nCount; i++ )
     {
         IMapObject* pCopyObj = rImageMap.GetIMapObject( i );
 
@@ -875,17 +871,17 @@ ImageMap& ImageMap::operator=( const ImageMap& rImageMap )
 |*
 \******************************************************************************/
 
-BOOL ImageMap::operator==( const ImageMap& rImageMap )
+sal_Bool ImageMap::operator==( const ImageMap& rImageMap )
 {
-    const USHORT    nCount = (USHORT) maList.Count();
-    const USHORT    nEqCount = rImageMap.GetIMapObjectCount();
-    BOOL            bRet = FALSE;
+    const sal_uInt16    nCount = (sal_uInt16) maList.Count();
+    const sal_uInt16    nEqCount = rImageMap.GetIMapObjectCount();
+    sal_Bool            bRet = sal_False;
 
     if ( nCount == nEqCount )
     {
-        BOOL bDifferent = ( aName != rImageMap.aName );
+        sal_Bool bDifferent = ( aName != rImageMap.aName );
 
-        for ( USHORT i = 0; ( i < nCount ) && !bDifferent; i++ )
+        for ( sal_uInt16 i = 0; ( i < nCount ) && !bDifferent; i++ )
         {
             IMapObject* pObj = (IMapObject*) maList.GetObject( i );
             IMapObject* pEqObj = rImageMap.GetIMapObject( i );
@@ -897,21 +893,21 @@ BOOL ImageMap::operator==( const ImageMap& rImageMap )
                     case( IMAP_OBJ_RECTANGLE ):
                     {
                         if ( !( (IMapRectangleObject*) pObj )->IsEqual( *(IMapRectangleObject*) pEqObj ) )
-                            bDifferent = TRUE;
+                            bDifferent = sal_True;
                     }
                     break;
 
                     case( IMAP_OBJ_CIRCLE ):
                     {
                         if ( !( (IMapCircleObject*) pObj )->IsEqual( *(IMapCircleObject*) pEqObj ) )
-                            bDifferent = TRUE;
+                            bDifferent = sal_True;
                     }
                     break;
 
                     case( IMAP_OBJ_POLYGON ):
                     {
                         if ( !( (IMapPolygonObject*) pObj )->IsEqual( *(IMapPolygonObject*) pEqObj ) )
-                            bDifferent = TRUE;
+                            bDifferent = sal_True;
                     }
                     break;
 
@@ -920,11 +916,11 @@ BOOL ImageMap::operator==( const ImageMap& rImageMap )
                 }
             }
             else
-                bDifferent = TRUE;
+                bDifferent = sal_True;
         }
 
         if ( !bDifferent )
-            bRet = TRUE;
+            bRet = sal_True;
     }
 
     return bRet;
@@ -937,7 +933,7 @@ BOOL ImageMap::operator==( const ImageMap& rImageMap )
 |*
 \******************************************************************************/
 
-BOOL ImageMap::operator!=( const ImageMap& rImageMap )
+sal_Bool ImageMap::operator!=( const ImageMap& rImageMap )
 {
     return !( *this == rImageMap );
 }
@@ -949,7 +945,7 @@ BOOL ImageMap::operator!=( const ImageMap& rImageMap )
 |*
 \******************************************************************************/
 
-UINT16 ImageMap::GetVersion() const
+sal_uInt16 ImageMap::GetVersion() const
 {
     return IMAGE_MAP_VERSION;
 }
@@ -992,7 +988,7 @@ void ImageMap::InsertIMapObject( const IMapObject& rIMapObject )
 IMapObject* ImageMap::GetHitIMapObject( const Size& rTotalSize,
                                         const Size& rDisplaySize,
                                         const Point& rRelHitPoint,
-                                        ULONG nFlags )
+                                        sal_uLong nFlags )
 {
     Point aRelPoint( rTotalSize.Width() * rRelHitPoint.X() / rDisplaySize.Width(),
                      rTotalSize.Height() * rRelHitPoint.Y() / rDisplaySize.Height() );
@@ -1031,9 +1027,9 @@ IMapObject* ImageMap::GetHitIMapObject( const Size& rTotalSize,
 Rectangle ImageMap::GetBoundRect() const
 {
     Rectangle   aBoundRect;
-    ULONG       nCount = maList.Count();
+    sal_uLong       nCount = maList.Count();
 
-    for ( ULONG i = 0; i < nCount; i++ )
+    for ( sal_uLong i = 0; i < nCount; i++ )
         aBoundRect.Union( ( (IMapObject*) maList.GetObject( i ) )->GetBoundRect() );
 
     return aBoundRect;
@@ -1048,9 +1044,9 @@ Rectangle ImageMap::GetBoundRect() const
 
 void ImageMap::Scale( const Fraction& rFracX, const Fraction& rFracY )
 {
-    USHORT nCount = (USHORT) maList.Count();
+    sal_uInt16 nCount = (sal_uInt16) maList.Count();
 
-    for ( USHORT i = 0; i < nCount; i++ )
+    for ( sal_uInt16 i = 0; i < nCount; i++ )
     {
         IMapObject* pObj = GetIMapObject( i );
 
@@ -1084,9 +1080,9 @@ void ImageMap::Scale( const Fraction& rFracX, const Fraction& rFracY )
 void ImageMap::ImpWriteImageMap( SvStream& rOStm, const String& rBaseURL ) const
 {
     IMapObject* pObj;
-    USHORT      nCount = (USHORT) maList.Count();
+    sal_uInt16      nCount = (sal_uInt16) maList.Count();
 
-    for ( USHORT i = 0; i < nCount; i++ )
+    for ( sal_uInt16 i = 0; i < nCount; i++ )
     {
         pObj = (IMapObject*) maList.GetObject( i );
         pObj->Write( rOStm, rBaseURL );
@@ -1100,12 +1096,12 @@ void ImageMap::ImpWriteImageMap( SvStream& rOStm, const String& rBaseURL ) const
 |*
 \******************************************************************************/
 
-void ImageMap::ImpReadImageMap( SvStream& rIStm, USHORT nCount, const String& rBaseURL )
+void ImageMap::ImpReadImageMap( SvStream& rIStm, sal_uInt16 nCount, const String& rBaseURL )
 {
     // neue Objekte einlesen
-    for ( USHORT i = 0; i < nCount; i++ )
+    for ( sal_uInt16 i = 0; i < nCount; i++ )
     {
-        UINT16 nType;
+        sal_uInt16 nType;
 
         rIStm >> nType;
         rIStm.SeekRel( -2 );
@@ -1154,8 +1150,8 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const
     IMapCompat*             pCompat;
     String                  aImageName( GetName() );
     String                  aDummy;
-    USHORT                  nOldFormat = rOStm.GetNumberFormatInt();
-    UINT16                  nCount = (UINT16) GetIMapObjectCount();
+    sal_uInt16                  nOldFormat = rOStm.GetNumberFormatInt();
+    sal_uInt16                  nCount = (sal_uInt16) GetIMapObjectCount();
     const rtl_TextEncoding  eEncoding = gsl_getSystemTextEncoding();
 
     rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
@@ -1190,8 +1186,8 @@ void ImageMap::Read( SvStream& rIStm, const String& rBaseURL )
 {
     ByteString  aString;
     char        cMagic[6];
-    USHORT      nOldFormat = rIStm.GetNumberFormatInt();
-    UINT16      nCount;
+    sal_uInt16      nOldFormat = rIStm.GetNumberFormatInt();
+    sal_uInt16      nCount;
 
     rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
     rIStm.Read( cMagic, sizeof( cMagic ) );
@@ -1226,9 +1222,4 @@ void ImageMap::Read( SvStream& rIStm, const String& rBaseURL )
 }
 
 
-#ifdef WIN
-#pragma optimize ( "", on )
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index d1cb4ddafd72..20e8ae6431b8 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -29,9 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifdef WIN
-#include <sysdep.hxx>
-#endif
 #include <string.h>
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
@@ -46,9 +43,6 @@
 #include <svtools/imapcirc.hxx>
 #include <svtools/imappoly.hxx>
 
-#ifdef WIN
-#include <sysdep.hxx>
-#endif
 #include <string.h>
 #include <math.h>
 
@@ -216,9 +210,9 @@ void IMapCircleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) cons
 void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL  ) const
 {
     ByteString      aStr( "polygon " );
-    const USHORT    nCount = aPoly.GetSize();
+    const sal_uInt16    nCount = aPoly.GetSize();
 
-    for ( USHORT i = 0; i < nCount; i++ )
+    for ( sal_uInt16 i = 0; i < nCount; i++ )
         AppendCERNCoords( aPoly[ i ], aStr );
 
     AppendCERNURL( aStr, rBaseURL );
@@ -236,11 +230,11 @@ void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL  ) co
 void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL  ) const
 {
     ByteString      aStr( "poly " );
-    const USHORT    nCount = Min( aPoly.GetSize(), (USHORT) 100 );
+    const sal_uInt16    nCount = Min( aPoly.GetSize(), (sal_uInt16) 100 );
 
     AppendNCSAURL( aStr, rBaseURL );
 
-    for ( USHORT i = 0; i < nCount; i++ )
+    for ( sal_uInt16 i = 0; i < nCount; i++ )
         AppendNCSACoords( aPoly[ i ], aStr );
 
     rOStm.WriteLine( aStr );
@@ -257,7 +251,7 @@ void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL  ) co
 |*
 \******************************************************************************/
 
-void ImageMap::Write( SvStream& rOStm, ULONG nFormat, const String& rBaseURL ) const
+void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat, const String& rBaseURL ) const
 {
     switch( nFormat )
     {
@@ -280,9 +274,9 @@ void ImageMap::Write( SvStream& rOStm, ULONG nFormat, const String& rBaseURL ) c
 void ImageMap::ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const
 {
     IMapObject* pObj;
-    USHORT      nCount = (USHORT) maList.Count();
+    sal_uInt16      nCount = (sal_uInt16) maList.Count();
 
-    for ( USHORT i = 0; i < nCount; i++ )
+    for ( sal_uInt16 i = 0; i < nCount; i++ )
     {
         pObj = GetIMapObject( i );
 
@@ -316,9 +310,9 @@ void ImageMap::ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const
 void ImageMap::ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL  ) const
 {
     IMapObject* pObj;
-    USHORT      nCount = (USHORT) maList.Count();
+    sal_uInt16      nCount = (sal_uInt16) maList.Count();
 
-    for ( USHORT i = 0; i < nCount; i++ )
+    for ( sal_uInt16 i = 0; i < nCount; i++ )
     {
         pObj = GetIMapObject( i );
 
@@ -349,9 +343,9 @@ void ImageMap::ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL  ) const
 |*
 \******************************************************************************/
 
-ULONG ImageMap::Read( SvStream& rIStm, ULONG nFormat, const String& rBaseURL  )
+sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat, const String& rBaseURL  )
 {
-    ULONG nRet = IMAP_ERR_FORMAT;
+    sal_uLong nRet = IMAP_ERR_FORMAT;
 
     if ( nFormat == IMAP_FORMAT_DETECT )
         nFormat = ImpDetectFormat( rIStm );
@@ -379,7 +373,7 @@ ULONG ImageMap::Read( SvStream& rIStm, ULONG nFormat, const String& rBaseURL  )
 |*
 \******************************************************************************/
 
-ULONG ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL )
+sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL )
 {
     ByteString aStr;
 
@@ -442,11 +436,11 @@ void ImageMap::ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL
         }
         else if ( ( aToken == "polygon" ) || ( aToken == "poly" ) )
         {
-            const USHORT    nCount = aStr.GetTokenCount( '(' ) - 1;
+            const sal_uInt16    nCount = aStr.GetTokenCount( '(' ) - 1;
             Polygon         aPoly( nCount );
             String          aURL;
 
-            for ( USHORT i = 0; i < nCount; i++ )
+            for ( sal_uInt16 i = 0; i < nCount; i++ )
                 aPoly[ i ] = ImpReadCERNCoords( &pStr );
 
             aURL = ImpReadCERNURL( &pStr, rBaseURL );
@@ -557,7 +551,7 @@ String ImageMap::ImpReadCERNURL( const char** ppStr, const String& rBaseURL )
 |*
 \******************************************************************************/
 
-ULONG ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL )
+sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL )
 {
     ByteString aStr;
 
@@ -622,11 +616,11 @@ void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL
         }
         else if ( aToken == "poly" )
         {
-            const USHORT    nCount = aStr.GetTokenCount( ',' ) - 1;
+            const sal_uInt16    nCount = aStr.GetTokenCount( ',' ) - 1;
             const String    aURL( ImpReadNCSAURL( &pStr, rBaseURL ) );
             Polygon         aPoly( nCount );
 
-            for ( USHORT i = 0; i < nCount; i++ )
+            for ( sal_uInt16 i = 0; i < nCount; i++ )
                 aPoly[ i ] = ImpReadNCSACoords( &pStr );
 
             IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, String(), String(), String(), String() );
@@ -712,10 +706,10 @@ Point ImageMap::ImpReadNCSACoords( const char** ppStr )
 |*
 \******************************************************************************/
 
-ULONG ImageMap::ImpDetectFormat( SvStream& rIStm )
+sal_uLong ImageMap::ImpDetectFormat( SvStream& rIStm )
 {
-    ULONG   nPos = rIStm.Tell();
-    ULONG   nRet = IMAP_FORMAT_BIN;
+    sal_uLong   nPos = rIStm.Tell();
+    sal_uLong   nRet = IMAP_FORMAT_BIN;
     char    cMagic[6];
 
     rIStm.Read( cMagic, sizeof( cMagic ) );
diff --git a/svtools/source/misc/imap3.cxx b/svtools/source/misc/imap3.cxx
index 1072121a3c5d..21cce8e7672f 100644
--- a/svtools/source/misc/imap3.cxx
+++ b/svtools/source/misc/imap3.cxx
@@ -41,7 +41,7 @@
 |*
 \******************************************************************************/
 
-IMapCompat::IMapCompat( SvStream& rStm, const USHORT nStreamMode ) :
+IMapCompat::IMapCompat( SvStream& rStm, const sal_uInt16 nStreamMode ) :
             pRWStm      ( &rStm ),
             nStmMode    ( nStreamMode )
 {
@@ -57,7 +57,7 @@ IMapCompat::IMapCompat( SvStream& rStm, const USHORT nStreamMode ) :
         }
         else
         {
-            UINT32 nTotalSizeTmp;
+            sal_uInt32 nTotalSizeTmp;
             *pRWStm >> nTotalSizeTmp;
             nTotalSize = nTotalSizeTmp;
             nCompatPos = pRWStm->Tell();
@@ -78,15 +78,15 @@ IMapCompat::~IMapCompat()
     {
         if ( nStmMode == STREAM_WRITE )
         {
-            const ULONG nEndPos = pRWStm->Tell();
+            const sal_uLong nEndPos = pRWStm->Tell();
 
             pRWStm->Seek( nCompatPos );
-            *pRWStm << (UINT32) ( nEndPos - nTotalSize );
+            *pRWStm << (sal_uInt32) ( nEndPos - nTotalSize );
             pRWStm->Seek( nEndPos );
         }
         else
         {
-            const ULONG nReadSize = pRWStm->Tell() - nCompatPos;
+            const sal_uLong nReadSize = pRWStm->Tell() - nCompatPos;
 
             if ( nTotalSize > nReadSize )
                 pRWStm->SeekRel( nTotalSize - nReadSize );
diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx
index 184b631cec65..0850947b9064 100644
--- a/svtools/source/misc/itemdel.cxx
+++ b/svtools/source/misc/itemdel.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include "itemdel.hxx"
+#include <svtools/itemdel.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/errcode.hxx>
 #include <limits.h>
@@ -125,7 +125,7 @@ void DeleteOnIdleItems()
      = ImpSvtData::GetSvtData().pItemDesruptList;
     if ( rpList )
     {
-        USHORT n;
+        sal_uInt16 n;
         while ( 0 != ( n = rpList->Count() ) )
             // Remove ist implizit im Dtor
             delete rpList->GetObject( n-1 );
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 1a139a2ff966..7d5bb5d49f35 100644..100755
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star;
 
 SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText )
 {
-    const USHORT nLen = rText.Len();
+    const sal_uInt16 nLen = rText.Len();
     if (nLen == 0)
         return String();
 
@@ -75,7 +75,7 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText )
     // Thus we can avoid to check every character of the text.
     bool bFound     = false;
     bool bIsRtlText = false;
-    for (USHORT i = 0;  i < nLen && !bFound;  ++i)
+    for (sal_uInt16 i = 0;  i < nLen && !bFound;  ++i)
     {
         sal_Int16 nDirection = rCharClass.getCharacterDirection( rText, i );
         switch (nDirection)
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index e521fbdba570..67d650b61c8e 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -301,7 +301,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Shuswap" ; LANGUAGE_USER_SHUSWAP ; > ;
         < "Oromo" ; LANGUAGE_OROMO ; > ;
         < "Greek, Ancient" ; LANGUAGE_USER_ANCIENT_GREEK ; > ;
-        < "Yiddish" ; LANGUAGE_YIDDISH ; > ;
+        < "Yiddish (Israel)" ; LANGUAGE_YIDDISH ; > ;
         < "Quechua (Ecuador)" ; LANGUAGE_QUECHUA_ECUADOR ; > ;
         < "Uyghur" ; LANGUAGE_UIGHUR_CHINA ; > ;
         < "Asturian" ; LANGUAGE_USER_ASTURIAN ; > ;
@@ -324,6 +324,12 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Rusyn (Ukraine)" ; LANGUAGE_USER_RUSYN_UKRAINE ; > ;
         < "Rusyn (Slovakia)" ; LANGUAGE_USER_RUSYN_SLOVAKIA ; > ;
         < "Kabyle Latin" ; LANGUAGE_TAMAZIGHT_LATIN ; > ;
+        < "Yiddish (USA)" ; LANGUAGE_USER_YIDDISH_US ; > ;
+        < "Hawaiian" ; LANGUAGE_HAWAIIAN_UNITED_STATES ; > ;
+        < "Limbu" ; LANGUAGE_USER_LIMBU ; > ;
+        < "Lojban" ; LANGUAGE_USER_LOJBAN ; > ;
+        < "Kabyle" ; LANGUAGE_USER_KABYLE ; > ;
+        < "Haitian" ; LANGUAGE_USER_HAITIAN ; > ;
     };
 };
 
diff --git a/svtools/source/misc/makefile.mk b/svtools/source/misc/makefile.mk
deleted file mode 100755
index fe7680492cd0..000000000000
--- a/svtools/source/misc/makefile.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svtools
-TARGET=misc
-
-ENABLE_EXCEPTIONS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-#use local "bmp" as it may not yet be delivered
-
-SRS1NAME=misc
-SRC1FILES=\
-    ehdl.src \
-    helpagent.src \
-    imagemgr.src      \
-    langtab.src 
-
-SRS2NAME=ehdl
-SRC2FILES=\
-    errtxt.src
-
-SLOFILES=\
-    $(SLO)$/acceleratorexecute.obj  \
-    $(SLO)$/chartprettypainter.obj \
-    $(SLO)$/cliplistener.obj        \
-    $(SLO)$/dialogclosedlistener.obj\
-    $(SLO)$/dialogcontrolling.obj   \
-    $(SLO)$/ehdl.obj                \
-    $(SLO)$/embedhlp.obj            \
-    $(SLO)$/embedtransfer.obj       \
-    $(SLO)$/filechangedchecker.obj  \
-    $(SLO)$/helpagentwindow.obj     \
-    $(SLO)$/imagemgr.obj            \
-    $(SLO)$/imageresourceaccess.obj \
-    $(SLO)$/imap.obj                \
-    $(SLO)$/imap2.obj               \
-    $(SLO)$/imap3.obj               \
-    $(SLO)$/itemdel.obj				\
-    $(SLO)$/langtab.obj				\
-    $(SLO)$/langhelp.obj			\
-    $(SLO)$/stringtransfer.obj      \
-    $(SLO)$/svtaccessiblefactory.obj \
-    $(SLO)$/svtdata.obj             \
-    $(SLO)$/templatefoldercache.obj \
-    $(SLO)$/transfer.obj            \
-    $(SLO)$/transfer2.obj           \
-    $(SLO)$/unitconv.obj           \
-    $(SLO)$/bindablecontrolhelper.obj   \
-    $(SLO)$/filterutils.obj   \
-    $(SLO)$/wallitem.obj           \
-    $(SLO)$/xwindowitem.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx
index 9429ac014df9..23c98175f7a2 100644
--- a/svtools/source/misc/svtdata.cxx
+++ b/svtools/source/misc/svtdata.cxx
@@ -61,25 +61,6 @@ ResMgr * ImpSvtData::GetResMgr()
     return GetResMgr(Application::GetSettings().GetUILocale());
 }
 
-ResMgr * ImpSvtData::GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale)
-{
-    if (!pPatchResMgr)
-    {
-        pPatchResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svp), aLocale);
-    }
-    return pPatchResMgr;
-}
-
-ResMgr * ImpSvtData::GetPatchResMgr()
-{
-    return GetPatchResMgr(Application::GetSettings().GetUILocale());
-}
-
-SvpResId::SvpResId( USHORT nId ) :
-    ResId( nId, *ImpSvtData::GetSvtData().GetPatchResMgr() )
-{
-}
-
 //============================================================================
 // static
 ImpSvtData & ImpSvtData::GetSvtData()
@@ -90,4 +71,9 @@ ImpSvtData & ImpSvtData::GetSvtData()
     return *static_cast<ImpSvtData *>(*pAppData);
 }
 
+SvtResId::SvtResId(sal_uInt16 nId, const ::com::sun::star::lang::Locale aLocale):
+        ResId(nId, *ImpSvtData::GetSvtData().GetResMgr(aLocale)) {}
+
+SvtResId::SvtResId(sal_uInt16 nId): ResId(nId, *ImpSvtData::GetSvtData().GetResMgr()) {}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 1543d2b5e076..20d82fe6e02b 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include "templatefoldercache.hxx"
+#include <svtools/templatefoldercache.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -117,8 +117,8 @@ namespace svt
     //=====================================================================
     struct TemplateContent;
     typedef ::std::vector< ::rtl::Reference< TemplateContent > >    TemplateFolderContent;
-        typedef TemplateFolderContent::const_iterator           ConstFolderIterator;
-        typedef TemplateFolderContent::iterator                 FolderIterator;
+    typedef TemplateFolderContent::const_iterator           ConstFolderIterator;
+    typedef TemplateFolderContent::iterator                 FolderIterator;
 
     /** a struct describing one content in one of the template dirs (or at least it's relevant aspects)
     */
@@ -706,15 +706,18 @@ namespace svt
         m_aCurrentState.swap( aTemplateFolderContent );
 
         // the template directories from the config
-        String      aDirs = SvtPathOptions().GetTemplatePath();
+        const SvtPathOptions aPathOptions;
+        String      aDirs = aPathOptions.GetTemplatePath();
         sal_uInt16  nDirs = aDirs.GetTokenCount( ';' );
 
         m_aCurrentState.reserve( nDirs );
         // loop through all the root-level template folders
         for ( sal_uInt16 i=0; i<nDirs; ++i)
         {
+            String sTemplatePath( aDirs.GetToken( i, ';' ) );
+            sTemplatePath = aPathOptions.ExpandMacros( sTemplatePath );
             // create a new entry
-            m_aCurrentState.push_back( new TemplateContent( INetURLObject( aDirs.GetToken( i, ';' ) ) ) );
+            m_aCurrentState.push_back( new TemplateContent( INetURLObject( sTemplatePath ) ) );
             TemplateFolderContent::iterator aCurrentRoot = m_aCurrentState.end();
             --aCurrentRoot;
 
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 1ce02a305513..2adee87e49a3 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -432,7 +432,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th
                         SvMemoryStream  aDstStm( 65535, 65535 );
 
                         // taking wmf without file header
-                        if ( ConvertGDIMetaFileToWMF( aMtf, aDstStm, NULL, FALSE ) )
+                        if ( ConvertGDIMetaFileToWMF( aMtf, aDstStm, NULL, sal_False ) )
                         {
                             maAny <<= ( aSeq = Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aDstStm.GetData() ),
                                                                      aDstStm.Seek( STREAM_SEEK_TO_END ) ) );
@@ -936,7 +936,7 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
             rFDesc1.dwFlags = FD_LINKUI;
 
             ByteString aStr( rBmk.GetDescription(), eSysCSet );
-            for( USHORT nChar = 0; nChar < aStr.Len(); ++nChar )
+            for( sal_uInt16 nChar = 0; nChar < aStr.Len(); ++nChar )
                 if( strchr( "\\/:*?\"<>|", aStr.GetChar( nChar ) ) )
                     aStr.Erase( nChar--, 1 );
 
@@ -1843,7 +1843,7 @@ sal_Bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIM
         if( GraphicConverter::Import( *xStm, aGraphic ) == ERRCODE_NONE )
         {
             rMtf = aGraphic.GetGDIMetaFile();
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -1857,7 +1857,7 @@ sal_Bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIM
         if( GraphicConverter::Import( *xStm, aGraphic ) == ERRCODE_NONE )
         {
             rMtf = aGraphic.GetGDIMetaFile();
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index 3ef70f236b0d..5e4fa8e56077 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -41,9 +41,8 @@
 #include <vcl/window.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
-
 #include "svl/urlbmk.hxx"
-#include "inetimg.hxx"
+#include <svtools/inetimg.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/transfer.hxx>
 
@@ -436,7 +435,7 @@ sal_Bool TransferDataContainer::GetData( const
     TDataCntnrEntryList::iterator   aIter( pImpl->aFmtList.begin() ),
                                     aEnd( pImpl->aFmtList.end() );
     sal_Bool bFnd = sal_False;
-    ULONG nFmtId = SotExchange::GetFormat( rFlavor );
+    sal_uLong nFmtId = SotExchange::GetFormat( rFlavor );
 
     // test first the list
     for( ; aIter != aEnd; ++aIter )
@@ -502,8 +501,8 @@ void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk )
 
 // -----------------------------------------------------------------------------
 
-void TransferDataContainer::CopyAnyData( ULONG nFormatId,
-                                        const sal_Char* pData, ULONG nLen )
+void TransferDataContainer::CopyAnyData( sal_uLong nFormatId,
+                                        const sal_Char* pData, sal_uLong nLen )
 {
     if( nLen )
     {
@@ -520,7 +519,7 @@ void TransferDataContainer::CopyAnyData( ULONG nFormatId,
 
 // -----------------------------------------------------------------------------
 
-void TransferDataContainer::CopyByteString( ULONG nFormatId,
+void TransferDataContainer::CopyByteString( sal_uLong nFormatId,
                                             const ByteString& rStr )
 {
     CopyAnyData( nFormatId, rStr.GetBuffer(), rStr.Len() );
@@ -570,7 +569,7 @@ void TransferDataContainer::CopyGraphic( const Graphic& rGrf )
 
 // -----------------------------------------------------------------------------
 
-void TransferDataContainer::CopyString( USHORT nFmt, const String& rStr )
+void TransferDataContainer::CopyString( sal_uInt16 nFmt, const String& rStr )
 {
     if( rStr.Len() )
     {
@@ -592,7 +591,7 @@ void TransferDataContainer::CopyString( const String& rStr )
 
 // -----------------------------------------------------------------------------
 
-void TransferDataContainer::CopyAny( USHORT nFmt,
+void TransferDataContainer::CopyAny( sal_uInt16 nFmt,
                                     const ::com::sun::star::uno::Any& rAny )
 {
     TDataCntnrEntry_Impl aEntry;
diff --git a/svtools/source/misc/undo.src b/svtools/source/misc/undo.src
new file mode 100644
index 000000000000..33c179a65032
--- /dev/null
+++ b/svtools/source/misc/undo.src
@@ -0,0 +1,43 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+ // include ------------------------------------------------------------------
+
+#include <svtools/svtools.hrc>
+
+String STR_UNDO
+{
+    Text [ en-US ] = "Undo: " ;
+};
+String STR_REDO
+{
+    Text [ en-US ] = "Re~do: " ;
+};
+String STR_REPEAT
+{
+    Text [ en-US ] = "~Repeat: " ;
+};
+\ No newline at end of file
diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx
index 2f59261f327f..17adaeaecd81 100644
--- a/svtools/source/misc/unitconv.cxx
+++ b/svtools/source/misc/unitconv.cxx
@@ -35,7 +35,7 @@
 
 // -----------------------------------------------------------------------
 
-void SetFieldUnit( MetricField& rField, FieldUnit eUnit, BOOL bAll )
+void SetFieldUnit( MetricField& rField, FieldUnit eUnit, sal_Bool bAll )
 {
     sal_Int64 nFirst    = rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) );
     sal_Int64 nLast = rField.Denormalize( rField.GetLast( FUNIT_TWIP ) );
@@ -95,7 +95,7 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, BOOL bAll )
 
 // -----------------------------------------------------------------------
 
-void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, BOOL bAll )
+void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, sal_Bool bAll )
 {
     sal_Int64 nMin = rBox.Denormalize( rBox.GetMin( FUNIT_TWIP ) );
     sal_Int64 nMax = rBox.Denormalize( rBox.GetMax( FUNIT_TWIP ) );
@@ -351,7 +351,7 @@ long ConvertValueToUnit( long nVal, SfxMapUnit eUnit )
 
 // -----------------------------------------------------------------------
 
-long CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor )
+long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFaktor )
 {
     DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP       ||
                 eUnit == SFX_MAPUNIT_100TH_MM   ||
@@ -723,8 +723,8 @@ long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew )
         return nVal;
     }
 
-    USHORT nOld = 0;
-    USHORT nNew = 0;
+    sal_uInt16 nOld = 0;
+    sal_uInt16 nNew = 0;
 
     switch ( aOld )
     {
diff --git a/svtools/source/misc/wallitem.cxx b/svtools/source/misc/wallitem.cxx
index 147cd0a6b154..b9d0300a140c 100644
--- a/svtools/source/misc/wallitem.cxx
+++ b/svtools/source/misc/wallitem.cxx
@@ -49,7 +49,7 @@
 #include <vcl/gradient.hxx>
 #include <vcl/cvtgrf.hxx>
 
-#include "wallitem.hxx"
+#include <svtools/wallitem.hxx>
 #include <svl/cntwall.hxx>
 
 // -----------------------------------------------------------------------
diff --git a/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx
index d801d06317b8..eea3f65577aa 100644
--- a/svtools/source/misc/xwindowitem.cxx
+++ b/svtools/source/misc/xwindowitem.cxx
@@ -47,7 +47,7 @@ XWindowItem::XWindowItem() :
 }
 
 
-XWindowItem::XWindowItem( USHORT nWhichId, Window * pWin ) :
+XWindowItem::XWindowItem( sal_uInt16 nWhichId, Window * pWin ) :
     SfxPoolItem( nWhichId )
 {
     if (pWin)
@@ -59,7 +59,7 @@ XWindowItem::XWindowItem( USHORT nWhichId, Window * pWin ) :
 }
 
 
-XWindowItem::XWindowItem( USHORT nWhichId, uno::Reference< awt::XWindow > & rxWin ) :
+XWindowItem::XWindowItem( sal_uInt16 nWhichId, uno::Reference< awt::XWindow > & rxWin ) :
     SfxPoolItem( nWhichId ),
     m_xWin( rxWin )
 {
author	Jan Holesovsky <kendy@suse.cz>	2011-03-11 14:24:23 +0100
committer	Jan Holesovsky <kendy@suse.cz>	2011-03-11 14:24:23 +0100
commit	67d2af6fac2d9bad52a6b1f6e0cbd1229eb88a42 (patch)
tree	898019746162b464578da9c8345158a74321c904 /svtools/source/misc
parent	86fb5fff88be611785b7908aac2a44475d77705f (diff)
parent	e2a3d487efb2bd5e582eb10e4150530c3f7377c5 (diff)